Commit94dc88a

authored

Merge pull requestdotnet#2249 from Microsoft/vs2017-rc3

merge vs2017-rc3 into vs2017-rtm

2 parents2d944d6 +ee8c105 commit94dc88aCopy full SHA for 94dc88a

File tree

+25

-3

lines changed

+25

-3

lines changed

Lines changed: 23 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,28 @@`
`226`	`226`	`<CompileInclude="@(TempCompile)" />`
`227`	`227`	`</ItemGroup>`
`228`	`228`	`</Target>`
`229`		`-`
	`229`	`+`
	`230`	`+ <TargetName="GetVsixPackageVersion"Outputs="$(VsixPackageVersion)">`
	`231`	`+ <PropertyGroup>`
	`232`	`+<!--`
	`233`	`+`
	`234`	`+ Given $(BUILD_BUILDNUMBER) = '20161225.1'`
	`235`	`+ Given $(MicroBuildAssemblyVersion) = '15.4.1.0'`
	`236`	`+`
	`237`	`+ Then $(BuildTimeStamp_Day) = 161225`
	`238`	`+ Then $(BuildTimeStamp_Number) = 01`
	`239`	`+ Then $(BuildTimeStamp) = 16122501`
	`240`	`+ Then $(MicroBuildAssemblyVersion_WithoutRevision) = 15.4.1`
	`241`	`+ Then $(VsixPackageVersion) = 15.4.1.16122501`
	`242`	`+`
	`243`	`+-->`
	`244`	`+ <BuildTimeStamp_Day>$(BUILD_BUILDNUMBER.Split('.')[0].Substring(2))</BuildTimeStamp_Day>`
	`245`	`+ <BuildTimeStamp_Number>$(BUILD_BUILDNUMBER.Split('.')[1].PadLeft(2, '0'))</BuildTimeStamp_Number>`
	`246`	`+ <BuildTimeStamp>$(BuildTimeStamp_Day)$(BuildTimeStamp_Number)</BuildTimeStamp>`
	`247`	`+ <MicroBuildAssemblyVersion_WithoutRevision>$(MicroBuildAssemblyVersion.Substring(0, $(MicroBuildAssemblyVersion.LastIndexOf('.'))))</MicroBuildAssemblyVersion_WithoutRevision>`
	`248`	`+ <VsixPackageVersion>$(MicroBuildAssemblyVersion_WithoutRevision).$(BuildTimeStamp)</VsixPackageVersion>`
	`249`	`+ </PropertyGroup>`
	`250`	`+ </Target>`
	`251`	`+`
`230`	`252`	`<ImportProject="..\packages\MicroBuild.Core.$(MicroBuildCoreVersion)\build\MicroBuild.Core.targets" />`
`231`	`253`	`</Project>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->`
`3`	`3`	`<PackageManifestVersion="2.0.0"xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">`
`4`	`4`	`<Metadata>`
`5`		`- <IdentityId="VisualFSharp"Version="15.4.1.0"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />`
	`5`	`+ <IdentityId="VisualFSharp"Version="\|%CurrentProject%;GetVsixPackageVersion\|"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />`
`6`	`6`	`<DisplayName>Visual F# Tools</DisplayName>`
`7`	`7`	`<Descriptionxml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>`
`8`	`8`	`<PackageId>Microsoft.FSharp.VSIX.Full.Core</PackageId>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.-->`
`3`	`3`	`<PackageManifestVersion="2.0.0"xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">`
`4`	`4`	`<Metadata>`
`5`		`- <IdentityId="VisualFSharp"Version="15.4.1.9055"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />`
	`5`	`+ <IdentityId="VisualFSharp"Version="42.42.42.42"Language="en-US"Publisher="Microsoft.VisualFSharpTools" />`
`6`	`6`	`<DisplayName>Visual F# Tools</DisplayName>`
`7`	`7`	`<Descriptionxml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>`
`8`	`8`	`<PackageId>Microsoft.FSharp.VSIX.OpenSource.Core</PackageId>`

Comments

(0)