Skip to content

Commit bf1b709

Browse files
committed
External facing portion of fix for 545 :VS2015 RTM about box shows "Visual F# 2015 RC" #545 - dotnet/fsharp#545
and 571 : Visual F# 4.0 package does not deploy on Express SKUs - dotnet/fsharp#571 Most of the fix was in the internal deployment sources.
1 parent ad93ef5 commit bf1b709

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

src/fsharp/FSharp.Core/printf.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1386,4 +1386,4 @@ module Printf =
13861386
[<CompiledName("PrintFormatLineToError")>]
13871387
let eprintfn fmt = fprintfn System.Console.Error fmt
13881388
#endif
1389-
#endif
1389+
#endif

vsintegration/src/deployment/EnableOpenSource/EnableOpenSource.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,4 @@
207207
<Target Name="AfterBuild">
208208
</Target>
209209
-->
210-
</Project>
210+
</Project>

vsintegration/src/deployment/VWDExpressDeployTemplates/extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33
<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">
44
<Metadata>
5-
<Identity Id="VWDExpressDeployTemplates..5f79f0a2-a505-490c-aa36-0dfb4b6f5489" Version="4.0.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
5+
<Identity Id="VWDExpressDeployTemplates..5f79f0a2-a505-490c-aa36-0dfb4b6f5489" Version="4.0.1" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
66
<DisplayName>Visual F# Tools Templates</DisplayName>
77
<Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio Express for Web</Description>
88
</Metadata>

vsintegration/src/deployment/VWDExpressDeployTemplates/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33
<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">
44
<Metadata>
5-
<Identity Id="VWDExpressDeployTemplates..5f79f0a2-a505-490c-aa36-0dfb4b6f5489" Version="4.0.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
5+
<Identity Id="VWDExpressDeployTemplates..5f79f0a2-a505-490c-aa36-0dfb4b6f5489" Version="4.0.1" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
66
<DisplayName>Visual F# Tools Templates</DisplayName>
77
<Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio Express for Web</Description>
88
</Metadata>

vsintegration/src/deployment/VsProDeployTemplates/extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33
<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">
44
<Metadata>
5-
<Identity Id="VsProDeployTemplates..9636fc84-1775-4415-9afa-c068d869d8b9" Version="4.0.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
5+
<Identity Id="VsProDeployTemplates..9636fc84-1775-4415-9afa-c068d869d8b9" Version="4.0.1" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
66
<DisplayName>Visual F# Tools Templates</DisplayName>
77
<Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>
88
</Metadata>

vsintegration/src/deployment/VsProDeployTemplates/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33
<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">
44
<Metadata>
5-
<Identity Id="VsProDeployTemplates..9636fc84-1775-4415-9afa-c068d869d8b9" Version="4.0.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
5+
<Identity Id="VsProDeployTemplates..9636fc84-1775-4415-9afa-c068d869d8b9" Version="4.0.1" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
66
<DisplayName>Visual F# Tools Templates</DisplayName>
77
<Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio</Description>
88
</Metadata>

vsintegration/src/deployment/WDExpressDeployTemplates/extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33
<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">
44
<Metadata>
5-
<Identity Id="WDExpressDeployTemplates..998e13a9-9f80-4bb6-9df9-3a20ae3fe28e" Version="4.0.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
5+
<Identity Id="WDExpressDeployTemplates..998e13a9-9f80-4bb6-9df9-3a20ae3fe28e" Version="4.0.1" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
66
<DisplayName>Visual F# Tools Templates</DisplayName>
77
<Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio Express for Windows Desktop</Description>
88
</Metadata>

vsintegration/src/deployment/WDExpressDeployTemplates/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33
<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">
44
<Metadata>
5-
<Identity Id="WDExpressDeployTemplates..998e13a9-9f80-4bb6-9df9-3a20ae3fe28e" Version="4.0.0" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
5+
<Identity Id="WDExpressDeployTemplates..998e13a9-9f80-4bb6-9df9-3a20ae3fe28e" Version="4.0.1" Language="en-US" Publisher="Microsoft.VisualFSharpTools" />
66
<DisplayName>Visual F# Tools Templates</DisplayName>
77
<Description xml:space="preserve">Deploy Visual F# Tools templates to Visual Studio Express for Windows Desktop</Description>
88
</Metadata>

0 commit comments

Comments
 (0)