Skip to content

Commit a537762

Browse files
paulvanbrenkpaulvanbrenk
authored
Merge pull request #1565 from Microsoft/future
Merge Node Tools 1.4 into master
2 parents 47323a2 + f72cd7c commit a537762

File tree

1,455 files changed

+59836
-95690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,455 files changed

+59836
-95690
lines changed

‎Build/Common.Build.CSharp.settings‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,16 @@
3030
<DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
3131
</PropertyGroup>
3232

33-
<PropertyGroup Condition=" '$(VSTarget)' == '15.0' ">
33+
<PropertyGroup>
3434
<VSCTDefinitions>DEV15;DEV15_OR_LATER;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER</VSCTDefinitions>
3535
<DefineConstants>$(DefineConstants);DEV15;DEV15_OR_LATER;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER</DefineConstants>
3636
<MicrosoftBuildAssemblyVersion>15.1.0.0</MicrosoftBuildAssemblyVersion>
3737
<MicrosoftBuildAssemblyVersionSuffix>Core</MicrosoftBuildAssemblyVersionSuffix>
3838
</PropertyGroup>
3939

40-
<PropertyGroup Condition=" '$(VSTarget)' == '14.0' ">
41-
<DefineConstants>$(DefineConstants);DEV14;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER</DefineConstants>
42-
<VSCTDefinitions>DEV14;DEV14_OR_LATER;DEV12_OR_LATER;DEV11_OR_LATER</VSCTDefinitions>
43-
<MicrosoftBuildAssemblyVersion>14.0.0.0</MicrosoftBuildAssemblyVersion>
44-
<MicrosoftBuildAssemblyVersionSuffix>Core</MicrosoftBuildAssemblyVersionSuffix>
45-
</PropertyGroup>
46-
4740
<PropertyGroup>
41+
<HighEntropyVA>true</HighEntropyVA>
42+
<Deterministic>true</Deterministic>
4843
<SignManifests>false</SignManifests>
4944
<SignAssembly>true</SignAssembly>
5045
<AssemblyOriginatorKeyFile>$(TargetsPath)\FinalPublicKey.snk</AssemblyOriginatorKeyFile>

‎Build/Common.Build.settings‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,38 @@
144144
<PropertyGroup>
145145
<CodeAnalysisRuleSet>$(BuildRoot)\Build\xTVS.ruleset</CodeAnalysisRuleSet>
146146
</PropertyGroup>
147+
148+
<PropertyGroup>
149+
<MajorVersion>1</MajorVersion>
150+
<MinorVersion>4</MinorVersion>
151+
152+
<!-- This was reset for Dev15. It needs to eventually be reset to the current year for Dev16 -->
153+
<VersionZeroYear>2016</VersionZeroYear>
154+
</PropertyGroup>
155+
156+
<!-- BUILD_BUILDNUMBER is expected to be set by the build server.
157+
In case of a local build, we'll default to a very
158+
high number so that the locally built assembly is always picked -->
159+
<PropertyGroup Condition="'$(BUILD_BUILDNUMBER)' == ''">
160+
<BuildVersion>42.42.42.42</BuildVersion>
161+
</PropertyGroup>
162+
163+
<PropertyGroup Condition="'$(BUILD_BUILDNUMBER)' != ''">
164+
<VersionCurrentYearOffset>$([MSBuild]::Subtract($([System.Int32]::Parse($(BUILD_BUILDNUMBER.Substring(0,4)))),$(VersionZeroYear)))</VersionCurrentYearOffset>
165+
<VersionCurrentYearOffset Condition=" '$(VersionCurrentYearOffset)' == '0' "></VersionCurrentYearOffset>
166+
167+
<!-- Example version numbers generated by this scheme:
168+
Built on 4/6/2016, targeting Visual Studio 1.4: 1.4.0406.1
169+
Built on 12/6/2017, targeting Visual Studio 1.4: 1.4.11206.1
170+
Built on 4/6/2019, targeting Visual Studio 1.4: 1.4.30406.1 -->
171+
<BuildVersion>$(MajorVersion).$(MinorVersion).$(VersionCurrentYearOffset)$(BUILD_BUILDNUMBER.Substring(4))</BuildVersion>
172+
</PropertyGroup>
173+
174+
<PropertyGroup>
175+
<BuildVersionExtended>$(BuildVersion)</BuildVersionExtended>
176+
<BuildVersionExtended Condition="'$(BUILD_SOURCEVERSION)'!=''">$(BuildVersionExtended) commit:$(BUILD_SOURCEVERSION)</BuildVersionExtended>
177+
178+
<VSIXBuildVersion>$(BuildVersion)</VSIXBuildVersion>
179+
<AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
180+
</PropertyGroup>
147181
</Project>

‎Build/Common.Build.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<Import Project="Common.Build.VSSDK.targets" Condition="$(UseVSSDK) or $(UseVSSDKTemplateOnly)" />
44
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(Language)' == 'C++'" />
55
<Import Project="Common.Build.Wix.targets" Condition="'$(Language)' == 'WiX'" />
6+
<Import Project="fileVersion.targets" Condition="'$(Language)' == 'C#'" />
67

78
<!--
89
Transforms ProjectReference2 items into references that will be built

‎Build/fileVersion.targets‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<GeneratedAssemblyInfoFile>$(IntermediateOutputPath)GeneratedAssemblyInfo$(DefaultLanguageSourceExtension)</GeneratedAssemblyInfoFile>
6+
</PropertyGroup>
7+
8+
<PropertyGroup>
9+
<CoreCompileDependsOn>GenerateAssemblyInfoFile;$(CoreCompileDependsOn)</CoreCompileDependsOn>
10+
</PropertyGroup>
11+
12+
<!-- Depends on PrepareForBuild because the latter is responsible for calling MakeDir(IntermediateOutputPath).
13+
Without it, if we do a design-time build of a project (e.g. in Workspace.LoadSolution) immediately following
14+
a tfpt treeclean, WriteCodeFragment may fail because the obj folder doesn't even exist at that time. -->
15+
<Target Name="GenerateAssemblyInfoFile"
16+
Inputs="$(MSBuildThisFileFullPath)"
17+
Outputs="$(GeneratedAssemblyInfoFile)"
18+
DependsOnTargets="PrepareForBuild"
19+
Condition="'$(Language)' == 'C#' or '$(Language)' == 'VB'">
20+
21+
<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."/>
22+
<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."/>
23+
24+
<ItemGroup>
25+
<AssemblyAttribute Include="System.Reflection.AssemblyCompanyAttribute">
26+
<_Parameter1>Microsoft Corporation</_Parameter1>
27+
</AssemblyAttribute>
28+
<AssemblyAttribute Include="System.Reflection.AssemblyCopyrightAttribute">
29+
<_Parameter1>© Microsoft Corporation. All rights reserved.</_Parameter1>
30+
</AssemblyAttribute>
31+
<AssemblyAttribute Include="System.Reflection.AssemblyVersionAttribute">
32+
<_Parameter1>$(AssemblyVersion)</_Parameter1>
33+
</AssemblyAttribute>
34+
<AssemblyAttribute Include="System.Reflection.AssemblyFileVersionAttribute">
35+
<_Parameter1>$(BuildVersion)</_Parameter1>
36+
</AssemblyAttribute>
37+
<AssemblyAttribute Include="System.Reflection.AssemblyInformationalVersionAttribute">
38+
<_Parameter1>$(BuildVersionExtended)</_Parameter1>
39+
</AssemblyAttribute>
40+
</ItemGroup>
41+
42+
<WriteCodeFragment AssemblyAttributes="@(AssemblyAttribute)"
43+
Language="$(Language)"
44+
OutputFile="$(GeneratedAssemblyInfoFile)">
45+
<Output TaskParameter="OutputFile" ItemName="Compile" />
46+
<Output TaskParameter="OutputFile" ItemName="FileWrites" />
47+
</WriteCodeFragment>
48+
</Target>
49+
50+
<Target Name="GetVSIXVersion" Outputs="$(VSIXBuildVersion)" />
51+
52+
</Project>

‎Common/Product/Icons/Dev10.0/GenericPackage.ico‎

-1.05 KB
Binary file not shown.

‎Common/Product/Icons/Dev10.0/Images_32bit.bmp‎

-4.55 KB
Binary file not shown.

‎Common/Product/Icons/Dev10.0/IronPythonWPFApplication.ico‎

-9.9 KB
Binary file not shown.

‎Common/Product/Icons/Dev10.0/IronPythonWpfWindow.ico‎

-9.9 KB
Binary file not shown.

‎Common/Product/Icons/Dev10.0/Package.ico‎

-1.05 KB
Binary file not shown.

‎Common/Product/Icons/Dev10.0/ProfilingCmdBar.bmp‎

-3.05 KB
Binary file not shown.

0 commit comments

Comments
 (0)