Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
b2a04160
F
fsharp
项目概览
dotNET Platform
/
fsharp
11 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b2a04160
编写于
11月 15, 2017
作者:
B
Brett V. Forsgren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove old .rc file
VSPackage.resx already has these resources.
上级
82a137cd
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
0 addition
and
67 deletion
+0
-67
DEVGUIDE.md
DEVGUIDE.md
+0
-3
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectResources.rc
...ation/src/FSharp.ProjectSystem.FSharp/ProjectResources.rc
+0
-12
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
...tion/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
+0
-10
vsintegration/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs
...tion/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs
+0
-42
未找到文件。
DEVGUIDE.md
浏览文件 @
b2a04160
...
...
@@ -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
\v
sintegration
\s
rc
\F
Sharp.ProjectSystem.FSharp
\o
bj
\n
et40
\P
rojectResources.rc.res.
Steps to build:
...
...
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectResources.rc
已删除
100644 → 0
浏览文件 @
82a137cd
// 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"
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
浏览文件 @
b2a04160
...
...
@@ -21,7 +21,6 @@
<TargetFrameworkVersion>
v4.6
</TargetFrameworkVersion>
<OtherFlags>
$(OtherFlags) --warnon:1182 --subsystemversion:6.00
</OtherFlags>
<Tailcalls
Condition=
"'$(CodeCoverage)' != ''"
>
false
</Tailcalls>
<RCResourceFile>
ProjectResources.rc
</RCResourceFile>
<ImportVSSDKTargets>
true
</ImportVSSDKTargets>
<CreateVsixContainer>
false
</CreateVsixContainer>
<DeployExtension>
false
</DeployExtension>
...
...
@@ -39,15 +38,6 @@
<Target
Name=
"CopyCtoFile"
>
<Copy
SourceFiles=
"@(VSCTCompile->'$(IntermediateOutputPath)%(FileName).cto')"
DestinationFiles=
"@(VSCTCompile->'ctofiles\%(FileName).cto')"
/>
</Target>
<PropertyGroup>
<Win32Resource>
$(IntermediateOutputPath)\ProjectResources.rc.res
</Win32Resource>
</PropertyGroup>
<Target
Name=
"BeforeBuild"
Condition=
"!Exists('$(IntermediateOutputPath)$(RCResourceFile).res')"
>
<Exec
Command=
""$(ProgramFiles)\Windows Kits\10\bin\$(UCRTVersion)\x86\rc.exe" /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)"
Condition=
"Exists('$(ProgramFiles)\Windows Kits\10\bin\$(UCRTVersion)\x86\rc.exe')"
/>
<Exec
Command=
""$(ProgramFiles)\Windows Kits\8.1\bin\x86\rc.exe" /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)"
Condition=
"Exists('$(ProgramFiles)\Windows Kits\8.1\bin\x86\rc.exe')"
/>
<Exec
Command=
""$(ProgramFiles)\Windows Kits\10\bin\x86\rc.exe" /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)"
Condition=
"Exists('$(ProgramFiles)\Windows Kits\10\bin\x86\rc.exe')"
/>
<Exec
Command=
""$(ProgramFiles)\Windows Kits\10\bin\10.0.15063.0\x86\rc.exe" /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)"
Condition=
"Exists('$(ProgramFiles)\Windows Kits\10\bin\10.0.15063.0\x86\rc.exe')"
/>
</Target>
<Target
Name=
"GatherBinariesToBeSigned"
AfterTargets=
"Localize"
Condition=
"'$(UseGatherBinaries)' == 'true'"
>
<ItemGroup>
<BinariesToBeSigned
Include=
"$(OutDir)$(AssemblyName).dll"
/>
...
...
vsintegration/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs
浏览文件 @
b2a04160
...
...
@@ -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
[<
DllImport
(
"shell32.dll"
,
CharSet
=
CharSet
.
Auto
)>]
extern
int32
ExtractIconEx
(
string
szFileName
,
int
nIconIndex
,
IntPtr
[]
phiconLarge
,
IntPtr
[]
phiconSmall
,
uint32
nIcons
)
[<
DllImport
(
"user32.dll"
,
EntryPoint
=
"DestroyIcon"
,
SetLastError
=
true
)>]
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
<
int
>)
hIconSmall
|>
Array
.
iter
(
fun
ptr
->
if
ptr
<>
IntPtr
.
Zero
then
DestroyIcon
ptr
|>
ignore
<
int
>)
/// 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
// "
[<
TestFixture
>]
type
Utilities
()
=
(*
...
...
@@ -745,13 +710,6 @@ type Utilities() =
[<
Test
>]
member
public
this
.
``PublicKeyToken.0a00000000000001``
()
=
CheckPublicKeyToString
([|
0xa
uy
;
0
uy
;
0
uy
;
0
uy
;
0
uy
;
0
uy
;
0
uy
;
1
uy
|],
"0a00000000000001"
)
[<
Test
>]
member
public
this
.
``CheckIconsInProjectSystemDLL_Regression5312``
()
=
let
path
=
typeof
<
Microsoft
.
VisualStudio
.
FSharp
.
ProjectSystem
.
FSharpProjectPackage
>.
Assembly
.
Location
Regression5312
.
checkIcons
4
path
()
[<
Test
>]
member
public
this
.
``Parse MSBuild property of type Int64``
()
=
Assert
.
AreEqual
(
123
L
,
ProjectNode
.
ParsePropertyValueToInt64
(
"123"
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录