Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit066bef3

Browse files
authored
Merge pull request #3957 from Microsoft/merges/master-to-dev15.6-20171116-080049
Merge master to dev15.6
2 parentsce49ce8 +f7f2917 commit066bef3

File tree

4 files changed

+0
-67
lines changed

4 files changed

+0
-67
lines changed

‎DEVGUIDE.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ To build and test Visual F# IDE Tools, install these requirements:
9999
- Under the "Windows" workloads, select ".NET desktop development"
100100
- Select "F# language support" under the optional components
101101
- Under the "Other Toolsets" workloads, select "Visual Studio extension development"
102-
- Under the "Individual components" tab select "Windows 10 SDK" as shown below (needed for compiling RC resource, see#2556):\
103-
![image](https://cloud.githubusercontent.com/assets/1249087/23730261/5c78c850-041b-11e7-9d9d-62766351fd0f.png)
104-
- Failing to install this will lead to error FS0193: Could not find file visualfsharp\vsintegration\src\FSharp.ProjectSystem.FSharp\obj\net40\ProjectResources.rc.res.
105102

106103
Steps to build:
107104

‎vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectResources.rc‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
2222
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
2323
<TailcallsCondition="'$(CodeCoverage)' != ''">false</Tailcalls>
24-
<RCResourceFile>ProjectResources.rc</RCResourceFile>
2524
<ImportVSSDKTargets>true</ImportVSSDKTargets>
2625
<CreateVsixContainer>false</CreateVsixContainer>
2726
<DeployExtension>false</DeployExtension>
@@ -39,15 +38,6 @@
3938
<TargetName="CopyCtoFile">
4039
<CopySourceFiles="@(VSCTCompile->'$(IntermediateOutputPath)%(FileName).cto')"DestinationFiles="@(VSCTCompile->'ctofiles\%(FileName).cto')" />
4140
</Target>
42-
<PropertyGroup>
43-
<Win32Resource>$(IntermediateOutputPath)\ProjectResources.rc.res</Win32Resource>
44-
</PropertyGroup>
45-
<TargetName="BeforeBuild"Condition="!Exists('$(IntermediateOutputPath)$(RCResourceFile).res')">
46-
<ExecCommand="&quot;$(ProgramFiles)\Windows Kits\10\bin\$(UCRTVersion)\x86\rc.exe&quot; /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)"Condition="Exists('$(ProgramFiles)\Windows Kits\10\bin\$(UCRTVersion)\x86\rc.exe')" />
47-
<ExecCommand="&quot;$(ProgramFiles)\Windows Kits\8.1\bin\x86\rc.exe&quot; /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)"Condition="Exists('$(ProgramFiles)\Windows Kits\8.1\bin\x86\rc.exe')" />
48-
<ExecCommand="&quot;$(ProgramFiles)\Windows Kits\10\bin\x86\rc.exe&quot; /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)"Condition="Exists('$(ProgramFiles)\Windows Kits\10\bin\x86\rc.exe')" />
49-
<ExecCommand="&quot;$(ProgramFiles)\Windows Kits\10\bin\10.0.15063.0\x86\rc.exe&quot; /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)"Condition="Exists('$(ProgramFiles)\Windows Kits\10\bin\10.0.15063.0\x86\rc.exe')" />
50-
</Target>
5141
<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize"Condition="'$(UseGatherBinaries)' == 'true'">
5242
<ItemGroup>
5343
<BinariesToBeSignedInclude="$(OutDir)$(AssemblyName).dll" />

‎vsintegration/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -630,41 +630,6 @@ type Miscellaneous() =
630630
project.Close()|> ignore
631631
)
632632

633-
634-
moduleRegression5312=
635-
// Regression testing ICONS in project system dll
636-
openSystem
637-
openSystem.Drawing
638-
openSystem.Runtime.InteropServices
639-
[<DllImport("shell32.dll", CharSet=CharSet.Auto)>]
640-
extern int32 ExtractIconEx(string szFileName, int nIconIndex,IntPtr[] phiconLarge, IntPtr[] phiconSmall,uint32 nIcons)
641-
642-
[<DllImport("user32.dll", EntryPoint="DestroyIcon", SetLastError=true)>]
643-
extern int DestroyIcon(IntPtr hIcon)
644-
645-
letextractIcon(path:string)(large:bool)=
646-
letn=10
647-
lethIconLarge= Array.create n IntPtr.Zero
648-
lethIconSmall= Array.create n IntPtr.Zero
649-
try
650-
letreadIconCount= ExtractIconEx(path,0,hIconLarge,hIconSmall,uint32 n)
651-
if readIconCount>0then
652-
if largethen
653-
Array.init readIconCount(fun i-> Icon.FromHandle(hIconLarge.[0]).Clone():?> Icon)
654-
else
655-
Array.init readIconCount(fun i-> Icon.FromHandle(hIconSmall.[0]).Clone():?> Icon)
656-
else
657-
[||]
658-
finally
659-
hIconLarge|> Array.iter(fun ptr->if ptr<> IntPtr.Zerothen DestroyIcon ptr|> ignore<int>)
660-
hIconSmall|> Array.iter(fun ptr->if ptr<> IntPtr.Zerothen DestroyIcon ptr|> ignore<int>)
661-
662-
/// Given path to FSharp.Project.FSharpProject.dll, check the icons are present.
663-
/// Throws of failure.
664-
letcheckIcons nExpected(path:string)=
665-
leticons= extractIcon pathtrue
666-
if icons.Length<>nExpectedthen failwithf"Expected%d icons in%s" nExpected path// "
667-
668633
[<TestFixture>]
669634
typeUtilities()=
670635
(*
@@ -745,13 +710,6 @@ type Utilities() =
745710
[<Test>]
746711
memberpublicthis.``PublicKeyToken.0a00000000000001``()= CheckPublicKeyToString([|0xauy;0uy;0uy;0uy;0uy;0uy;0uy;1uy|],"0a00000000000001")
747712

748-
[<Test>]
749-
memberpublicthis.``CheckIconsInProjectSystemDLL_Regression5312``()=
750-
letpath= typeof<Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpProjectPackage>.Assembly.Location
751-
Regression5312.checkIcons4 path
752-
()
753-
754-
755713
[<Test>]
756714
memberpublicthis.``Parse MSBuild property of type Int64``()=
757715
Assert.AreEqual(123L, ProjectNode.ParsePropertyValueToInt64("123"))

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp