diff --git a/DEVGUIDE.md b/DEVGUIDE.md index d7f8318118cba513626d93b696ba10a70f168ceb..73d3ef08f4973566bfd54a151ebb21b2c5285497 100644 --- a/DEVGUIDE.md +++ b/DEVGUIDE.md @@ -99,9 +99,6 @@ To build and test Visual F# IDE Tools, install these requirements: - Under the "Windows" workloads, select ".NET desktop development" - Select "F# language support" under the optional components - Under the "Other Toolsets" workloads, select "Visual Studio extension development" - - Under the "Individual components" tab select "Windows 10 SDK" as shown below (needed for compiling RC resource, see #2556): \ - ![image](https://cloud.githubusercontent.com/assets/1249087/23730261/5c78c850-041b-11e7-9d9d-62766351fd0f.png) - - Failing to install this will lead to error FS0193: Could not find file visualfsharp\vsintegration\src\FSharp.ProjectSystem.FSharp\obj\net40\ProjectResources.rc.res. Steps to build: diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectResources.rc b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectResources.rc deleted file mode 100644 index c205f665be72e0161ec966c538b6f64e0e177b9a..0000000000000000000000000000000000000000 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectResources.rc +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. - -// Note that, regardless of what numbers are given here, the wix code (src\wix\script.fs) that references these uses 'IconIndex' starting at 0 -#define FS 100 -#define FSI 101 -#define FSX 102 -#define FSPROJ 103 -// Note that these are not always the same as the .bmp that appears in Solution Explorer, but we think these are best for 'windows folder' for now -FS ICON "Resources\FSharpCodeFile_32.ico" -FSI ICON "Resources\FSharpSignature.ico" -FSX ICON "Resources\FSharpScript.ico" -FSPROJ ICON "Resources\FSharpAboutBox.ico" diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj index ff08f31bb70f091b96dd8f24e21c63b2221f932b..2708ef1e62cfd3c185a803cd694f4f950b168d67 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj @@ -21,7 +21,6 @@ v4.6 $(OtherFlags) --warnon:1182 --subsystemversion:6.00 false - ProjectResources.rc true false false @@ -39,15 +38,6 @@ - - $(IntermediateOutputPath)\ProjectResources.rc.res - - - - - - - diff --git a/vsintegration/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs b/vsintegration/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs index a90f9d286512e7450f10ee791d6953d5e2cbf472..361f6569b164be36a4816fcd301460bf7706cb5f 100644 --- a/vsintegration/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs +++ b/vsintegration/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs @@ -630,41 +630,6 @@ type Miscellaneous() = project.Close() |> ignore ) - -module Regression5312 = - // Regression testing ICONS in project system dll - open System - open System.Drawing - open System.Runtime.InteropServices - [] - extern int32 ExtractIconEx(string szFileName, int nIconIndex,IntPtr[] phiconLarge, IntPtr[] phiconSmall,uint32 nIcons) - - [] - extern int DestroyIcon(IntPtr hIcon) - - let extractIcon (path:string) (large:bool) = - let n = 10 - let hIconLarge = Array.create n IntPtr.Zero - let hIconSmall = Array.create n IntPtr.Zero - try - let readIconCount = ExtractIconEx(path,0,hIconLarge,hIconSmall,uint32 n) - if readIconCount > 0 then - if large then - Array.init readIconCount (fun i -> Icon.FromHandle(hIconLarge.[0]).Clone() :?> Icon) - else - Array.init readIconCount (fun i -> Icon.FromHandle(hIconSmall.[0]).Clone() :?> Icon) - else - [| |] - finally - hIconLarge |> Array.iter (fun ptr -> if ptr <> IntPtr.Zero then DestroyIcon ptr |> ignore) - hIconSmall |> Array.iter (fun ptr -> if ptr <> IntPtr.Zero then DestroyIcon ptr |> ignore) - - /// Given path to FSharp.Project.FSharpProject.dll, check the icons are present. - /// Throws of failure. - let checkIcons nExpected (path:string) = - let icons = extractIcon path true - if icons.Length<>nExpected then failwithf "Expected %d icons in %s" nExpected path // " - [] type Utilities() = (* @@ -745,13 +710,6 @@ type Utilities() = [] member public this.``PublicKeyToken.0a00000000000001``() = CheckPublicKeyToString([|0xauy;0uy;0uy;0uy;0uy;0uy;0uy;1uy|], "0a00000000000001") - [] - member public this.``CheckIconsInProjectSystemDLL_Regression5312``() = - let path = typeof.Assembly.Location - Regression5312.checkIcons 4 path - () - - [] member public this.``Parse MSBuild property of type Int64`` () = Assert.AreEqual(123L, ProjectNode.ParsePropertyValueToInt64("123"))