Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions Build/Common.Build.settings
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,38 @@
<PropertyGroup>
<CodeAnalysisRuleSet>$(BuildRoot)\Build\xTVS.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<PropertyGroup>
<MajorVersion>1</MajorVersion>
<MinorVersion>4</MinorVersion>

<!-- This was reset for Dev15. It needs to eventually be reset to the current year for Dev16 -->
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment doesn't make as much sense here as it did in the original place you copied from. Here you can just set the year to 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still like to reset the year every so often to make sure the build numbers < int16.max

<VersionZeroYear>2016</VersionZeroYear>
</PropertyGroup>

<!-- BUILD_BUILDNUMBER is expected to be set by the build server.
In case of a local build, we'll default to a very
high number so that the locally built assembly is always picked -->
<PropertyGroup Condition="'$(BUILD_BUILDNUMBER)' == ''">
<BuildVersion>42.42.42.42</BuildVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(BUILD_BUILDNUMBER)' != ''">
<VersionCurrentYearOffset>$([MSBuild]::Subtract($([System.Int32]::Parse($(BUILD_BUILDNUMBER.Substring(0,4)))),$(VersionZeroYear)))</VersionCurrentYearOffset>
<VersionCurrentYearOffset Condition=" '$(VersionCurrentYearOffset)' == '0' "></VersionCurrentYearOffset>

<!-- Example version numbers generated by this scheme:
Built on 4/6/2016, targeting Visual Studio 1.4: 1.4.0406.1
Built on 12/6/2017, targeting Visual Studio 1.4: 1.4.11206.1
Built on 4/6/2019, targeting Visual Studio 1.4: 1.4.30406.1 -->
<BuildVersion>$(MajorVersion).$(MinorVersion).$(VersionCurrentYearOffset)$(BUILD_BUILDNUMBER.Substring(4))</BuildVersion>
</PropertyGroup>

<PropertyGroup>
<BuildVersionExtended>$(BuildVersion)</BuildVersionExtended>
<BuildVersionExtended Condition="'$(BUILD_SOURCEVERSION)'!=''">$(BuildVersionExtended) commit:$(BUILD_SOURCEVERSION)</BuildVersionExtended>

<VSIXBuildVersion>$(BuildVersion)</VSIXBuildVersion>
<AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions Build/Common.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Import Project="Common.Build.VSSDK.targets" Condition="$(UseVSSDK) or $(UseVSSDKTemplateOnly)" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(Language)' == 'C++'" />
<Import Project="Common.Build.Wix.targets" Condition="'$(Language)' == 'WiX'" />
<Import Project="fileVersion.targets" Condition="'$(Language)' == 'C#'" />

<!--
Transforms ProjectReference2 items into references that will be built
Expand Down
52 changes: 52 additions & 0 deletions Build/fileVersion.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<GeneratedAssemblyInfoFile>$(IntermediateOutputPath)GeneratedAssemblyInfo$(DefaultLanguageSourceExtension)</GeneratedAssemblyInfoFile>
</PropertyGroup>

<PropertyGroup>
<CoreCompileDependsOn>GenerateAssemblyInfoFile;$(CoreCompileDependsOn)</CoreCompileDependsOn>
</PropertyGroup>

<!-- Depends on PrepareForBuild because the latter is responsible for calling MakeDir(IntermediateOutputPath).
Without it, if we do a design-time build of a project (e.g. in Workspace.LoadSolution) immediately following
a tfpt treeclean, WriteCodeFragment may fail because the obj folder doesn't even exist at that time. -->
<Target Name="GenerateAssemblyInfoFile"
Inputs="$(MSBuildThisFileFullPath)"
Outputs="$(GeneratedAssemblyInfoFile)"
DependsOnTargets="PrepareForBuild"
Condition="'$(Language)' == 'C#' or '$(Language)' == 'VB'">

<Error Condition="'$(BuildVersion)'==''" Text="'BuildVersion' is not defined. Try rebuilding clean. If the problem presists, make sure gdb.settings.targets is included in this project."/>
<Error Condition="'$(AssemblyVersion)'==''" Text="'AssemblyVersion' is not defined. Try rebuilding clean. If the problem presists, make sure gdb.settings.targets is included in this project."/>

<ItemGroup>
<AssemblyAttribute Include="System.Reflection.AssemblyCompanyAttribute">
<_Parameter1>Microsoft Corporation</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyCopyrightAttribute">
<_Parameter1>© Microsoft Corporation. All rights reserved.</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyVersionAttribute">
<_Parameter1>$(AssemblyVersion)</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyFileVersionAttribute">
<_Parameter1>$(BuildVersion)</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute">
<_Parameter1>$(BuildVersionExtended)</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

<WriteCodeFragment AssemblyAttributes="@(AssemblyAttribute)"
Language="$(Language)"
OutputFile="$(GeneratedAssemblyInfoFile)">
<Output TaskParameter="OutputFile" ItemName="Compile" />
<Output TaskParameter="OutputFile" ItemName="FileWrites" />
</WriteCodeFragment>
</Target>

<Target Name="GetVSIXVersion" Outputs="$(VSIXBuildVersion)" />

</Project>
2 changes: 1 addition & 1 deletion Common/Product/TestAdapter/VisualStudioApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private static DTE GetDTE(int processId)
prefix = "VisualStudio";
}

var progId = $"!{prefix}.DTE.{AssemblyVersionInfo.VSVersion}:{processId}";
var progId = $"!{prefix}.DTE.15.0:{processId}";
object runningObject = null;

IBindCtx bindCtx = null;
Expand Down
13 changes: 0 additions & 13 deletions Nodejs/Product/AssemblyInfoCommon.cs

This file was deleted.

41 changes: 0 additions & 41 deletions Nodejs/Product/AssemblyVersion.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]

[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.InteractiveWindow", CodeBase = "Microsoft.NodejsTools.InteractiveWindow.dll", Version = AssemblyVersionInfo.StableVersion)]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.InteractiveWindow", CodeBase = "Microsoft.NodejsTools.InteractiveWindow.dll", Version = "1.0.0.0")]
[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.Satellite)]
[assembly: InternalsVisibleTo("TestUtilities.UI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
[assembly: InternalsVisibleTo("ReplWindowUITests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
Expand Down
11 changes: 4 additions & 7 deletions Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="29102E6C-34F2-4FF1-BA2F-C02ADE3846E8" Version="1.4.0.2" Language="en-US" Publisher="Microsoft" />
<Identity Id="29102E6C-34F2-4FF1-BA2F-C02ADE3846E8" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
<DisplayName>Node.js Tools - Interactive Window</DisplayName>
<Description xml:space="preserve">Node.js Tools - Interactive Window.</Description>
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
Expand All @@ -13,12 +13,9 @@
Id specifications are minimums; any SKU equal or 'higher' will accept
them. -->
<Installation>
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VWDExpress" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/NodejsPackage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace Microsoft.NodejsTools
[PackageRegistration(UseManagedResourcesOnly = true)]
// This attribute is used to register the information needed to show this package
// in the Help/About dialog of Visual Studio.
[InstalledProductRegistration("#110", "#112", AssemblyVersionInfo.Version, IconResourceID = 400)]
[InstalledProductRegistration("#110", "#112", "1.0.0.0", IconResourceID = 400)]
[Guid(Guids.NodejsPackageString)]
[ProvideOptionPage(typeof(NodejsGeneralOptionsPage), "Node.js Tools", "General", 114, 115, true)]
[ProvideOptionPage(typeof(NodejsNpmOptionsPage), "Node.js Tools", "Npm", 114, 116, true)]
Expand Down
8 changes: 4 additions & 4 deletions Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.Satellite)]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools", CodeBase = "Microsoft.NodejsTools.dll", Version = AssemblyVersionInfo.StableVersion)]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.Npm", CodeBase = "Microsoft.NodejsTools.Npm.dll", Version = AssemblyVersionInfo.StableVersion)]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.PressAnyKey", CodeBase = "Microsoft.NodejsTools.PressAnyKey.exe", Version = AssemblyVersionInfo.StableVersion)]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools", CodeBase = "Microsoft.NodejsTools.dll", Version = "1.0.0.0")]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.Npm", CodeBase = "Microsoft.NodejsTools.Npm.dll", Version = "1.0.0.0")]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.PressAnyKey", CodeBase = "Microsoft.NodejsTools.PressAnyKey.exe", Version = "1.0.0.0")]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.ProjectWizard", CodeBase = "Microsoft.NodejsTools.ProjectWizard.dll", Version = "1.0.0.0")]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.TestAdapter", CodeBase = "Microsoft.NodejsTools.TestAdapter.dll", Version = AssemblyVersionInfo.StableVersion)]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.TestAdapter", CodeBase = "Microsoft.NodejsTools.TestAdapter.dll", Version = "1.0.0.0")]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.Telemetry.15.0", CodeBase = "Microsoft.NodejsTools.Telemetry.15.0.dll", Version = "15.0.1.0")]

[assembly: InternalsVisibleTo("TestUtilities.NodeJS, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
Expand Down
11 changes: 4 additions & 7 deletions Nodejs/Product/Nodejs/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="FE8A8C3D-328A-476D-99F9-2A24B75F8C7F" Version="1.4.0.2" Language="en-US" Publisher="Microsoft" />
<Identity Id="FE8A8C3D-328A-476D-99F9-2A24B75F8C7F" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
<DisplayName>Node.js Tools</DisplayName>
<Description xml:space="preserve">Provides support for editing and debugging Node.js programs.</Description>
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
Expand All @@ -10,12 +10,9 @@
<PackageId>Microsoft.VisualStudio.NodejsTools.NodejsTools</PackageId>
</Metadata>
<Installation>
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VWDExpress" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" Version="4.5" />
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Profiling/NodejsProfilingPackage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace Microsoft.NodejsTools.Profiling
[Description("Node.js Tools Profiling Package")]
// This attribute is used to register the informations needed to show the this package
// in the Help/About dialog of Visual Studio.
[InstalledProductRegistration("#110", "#112", AssemblyVersionInfo.Version, IconResourceID = 400)]
[InstalledProductRegistration("#110", "#112", "1.0.0.0", IconResourceID = 400)]
// This attribute is needed to let the shell know that this package exposes some menus.
[ProvideMenuResource("Menus.ctmenu", 1)]
[Guid(ProfilingGuids.NodejsProfilingPkgString)]
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Profiling/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]

[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.Profiling", CodeBase = "Microsoft.NodejsTools.Profiling.dll", Version = AssemblyVersionInfo.StableVersion)]
[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.Profiling", CodeBase = "Microsoft.NodejsTools.Profiling.dll", Version = "1.0.0.0")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand Down
11 changes: 4 additions & 7 deletions Nodejs/Product/Profiling/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="B515653F-FB69-4B64-9D3F-F1FCF8421DD0" Version="1.4.0.2" Language="en-US" Publisher="Microsoft" />
<Identity Id="B515653F-FB69-4B64-9D3F-F1FCF8421DD0" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
<DisplayName>Node.js Tools - Profiling</DisplayName>
<Description xml:space="preserve">Provides support for profiling Node.js projects</Description>
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
Expand All @@ -13,12 +13,9 @@
Id specifications are minimums; any SKU equal or 'higher' will accept
them. -->
<Installation>
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VWDExpress" />
<InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
Expand Down
13 changes: 0 additions & 13 deletions Nodejs/Product/ProjectAfter.settings
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Choose>
<When Condition="'$(Language)' == 'C#'">
<ItemGroup>
<Compile Include="$(BuildRoot)\Nodejs\Product\AssemblyInfoCommon.cs">
<Link>AssemblyInfoCommon.cs</Link>
</Compile>
<Compile Include="$(BuildRoot)\Nodejs\Product\AssemblyVersion.cs">
<Link>AssemblyVersion.cs</Link>
</Compile>
</ItemGroup>
</When>
</Choose>

<Import Project="$(BuildRoot)\Build\Common.Build.targets" />
</Project>
13 changes: 0 additions & 13 deletions Nodejs/Product/ProjectWizard/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("dfdf8c10-b0c5-43d5-8ab6-833523131644")]
[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.Satellite)]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] // Version is fixed so we can refer to it from .vstemplate files

3 changes: 0 additions & 3 deletions Nodejs/Product/WebRole/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,3 @@

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("A87D74DE-BD73-4FDF-9D76-06D2C76F2460")]



Loading