Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
ceffd871
F
fsharp
项目概览
dotNET Platform
/
fsharp
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
ceffd871
编写于
5月 16, 2018
作者:
B
Brett V. Forsgren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename SWIX packages and remove unnecessary SDK resources package
上级
80e860c4
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
7 addition
and
77 deletion
+7
-77
build/config/InsertionSignToolData.json
build/config/InsertionSignToolData.json
+1
-2
setup/Swix/Microsoft.FSharp.Compiler.Resources/Empty.swr
setup/Swix/Microsoft.FSharp.Compiler.Resources/Empty.swr
+0
-1
setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr
setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr
+0
-1
setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr
setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr
+1
-5
setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
+0
-5
setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
+0
-10
setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
...arp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
+0
-43
setup/Swix/Microsoft.FSharp.SDK/Files.swr
setup/Swix/Microsoft.FSharp.SDK/Files.swr
+1
-1
setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj
...p/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj
+1
-1
setup/Swix/Microsoft.FSharp.vsmanproj
setup/Swix/Microsoft.FSharp.vsmanproj
+1
-2
setup/build-insertion.proj
setup/build-insertion.proj
+2
-6
未找到文件。
build/config/InsertionSignToolData.json
浏览文件 @
ceffd871
...
...
@@ -6,8 +6,7 @@
"values"
:
[
"insertion
\\
Microsoft.FSharp.Compiler.vsix"
,
"insertion
\\
Microsoft.FSharp.Compiler.Resources.*.vsix"
,
"insertion
\\
Microsoft.FSharp.SDK.Core.vsix"
,
"insertion
\\
Microsoft.FSharp.SDK.Resources.*.vsix"
"insertion
\\
Microsoft.FSharp.SDK.vsix"
]
}
],
...
...
setup/Swix/Microsoft.FSharp.Compiler.Resources/Empty.swr
浏览文件 @
ceffd871
...
...
@@ -3,4 +3,3 @@ use vs
package
name
=
Microsoft
.
FSharp
.
Compiler
.
Resources
version
=$(
FSharpPackageVersion
)
vs
.
package
.
language
=$(
LocaleSpecificCulture
)
vs
.
package
.
providerKey
=
Microsoft
.
FSharp
.
Compiler
.
Resources
,$(
LocaleSpecificCulture
),
v4
.1
setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr
浏览文件 @
ceffd871
...
...
@@ -3,7 +3,6 @@ use vs
package
name
=
Microsoft
.
FSharp
.
Compiler
.
Resources
version
=$(
FSharpPackageVersion
)
vs
.
package
.
language
=$(
LocaleSpecificCulture
)
vs
.
package
.
providerKey
=
Microsoft
.
FSharp
.
Compiler
.
Resources
,$(
LocaleSpecificCulture
),
v4
.1
folder
"InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\$(LocaleParentCulture)"
file
source
=
"$(BinariesFolder)
\n
et40
\b
in\$(LocaleParentCulture)\FSharp.Build.resources.dll"
...
...
setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr
浏览文件 @
ceffd871
...
...
@@ -8,11 +8,7 @@ vs.dependencies
version
=$(
FSharpPackageVersion
)
type
=
Required
vs
.
dependency
id
=
Microsoft
.
FSharp
.
SDK
.
Core
version
=$(
FSharpPackageVersion
)
type
=
Required
vs
.
dependency
id
=
Microsoft
.
FSharp
.
SDK
.
Resources
vs
.
dependency
id
=
Microsoft
.
FSharp
.
SDK
version
=$(
FSharpPackageVersion
)
type
=
Required
...
...
setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
已删除
100644 → 0
浏览文件 @
80e860c4
use
vs
package
name
=
Microsoft
.
FSharp
.
SDK
.
Resources
version
=$(
FSharpPackageVersion
)
vs
.
package
.
language
=$(
LocaleSpecificCulture
)
setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
已删除
100644 → 0
浏览文件 @
80e860c4
use
vs
package
name
=
Microsoft
.
FSharp
.
SDK
.
Resources
version
=$(
FSharpPackageVersion
)
vs
.
package
.
language
=$(
LocaleSpecificCulture
)
folder
"InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\$(LocaleParentCulture)"
file
"FSharp.Build.resources.dll"
source
=
"$(BinariesFolder)
\n
et40
\b
in\$(LocaleParentCulture)\FSharp.Build.resources.dll"
file
"FSharp.Compiler.Private.resources.dll"
source
=
"$(BinariesFolder)
\n
et40
\b
in\$(LocaleParentCulture)\FSharp.Compiler.Private.resources.dll"
file
"FSharp.Core.resources.dll"
source
=
"$(BinariesFolder)
\n
et40
\b
in\$(LocaleParentCulture)\FSharp.Core.resources.dll"
setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
已删除
100644 → 0
浏览文件 @
80e860c4
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
<Project
InitialTargets=
"CheckPropertiesArePassed"
xmlns=
"http://schemas.microsoft.com/developer/msbuild/2003"
>
<PropertyGroup>
<FSharpSourcesRoot>
..\..\..\src
</FSharpSourcesRoot>
<OutputArchitecture>
neutral
</OutputArchitecture>
<OutputLocalized>
false
</OutputLocalized>
<OutputName>
Microsoft.FSharp.SDK.Resources.$(LocaleCode)
</OutputName>
<IsPackage>
true
</IsPackage>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<BinariesFolder>
$(FSharpSourcesRoot)\..\$(Configuration)
</BinariesFolder>
<OutputPath>
$(BinariesFolder)\insertion
</OutputPath>
<OutputType>
vsix
</OutputType>
<IntermediateOutputPath>
$(MSBuildThisFileDirectory)obj
</IntermediateOutputPath>
</PropertyGroup>
<Import
Project=
"$(FSharpSourcesRoot)\Microbuild.Settings.targets"
/>
<PropertyGroup>
<PackagePreprocessorDefinitions>
$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)
</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>
$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)
</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>
$(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture)
</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>
$(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture)
</PackagePreprocessorDefinitions>
</PropertyGroup>
<ItemGroup
Condition=
"'$(IsLangPack)' != 'true'"
>
<Package
Include=
"Empty.swr"
/>
</ItemGroup>
<ItemGroup
Condition=
"'$(IsLangPack)' == 'true'"
>
<Package
Include=
"Files.swr"
/>
</ItemGroup>
<Target
Name=
"CheckPropertiesArePassed"
>
<Error
Condition=
"'$(LocaleParentCulture)' == ''"
Text=
"A 'LocaleParentCulture' property must be passed to the project."
/>
<Error
Condition=
"'$(LocaleSpecificCulture)' == ''"
Text=
"A 'LocaleSpecificCulture' property must be passed to the project."
/>
<Error
Condition=
"'$(IsLangPack)' == ''"
Text=
"A 'IsLangPack' property must be passed to the project."
/>
<Error
Condition=
"'$(FSharpPackageVersion)' == ''"
Text=
"A 'FSharpPackageVersion' property must be passed to the project."
/>
</Target>
<Target
Name=
"SignFiles"
>
<!-- Signing is handled by the RoslynSignTool -->
</Target>
</Project>
setup/Swix/Microsoft.FSharp.SDK
.Core
/Files.swr
→
setup/Swix/Microsoft.FSharp.SDK/Files.swr
浏览文件 @
ceffd871
use
vs
package
name
=
Microsoft
.
FSharp
.
SDK
.
Core
package
name
=
Microsoft
.
FSharp
.
SDK
version
=$(
FSharpPackageVersion
)
folder
"InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
...
...
setup/Swix/Microsoft.FSharp.SDK
.Core/Microsoft.FSharp.SDK.Core
.swixproj
→
setup/Swix/Microsoft.FSharp.SDK
/Microsoft.FSharp.SDK
.swixproj
浏览文件 @
ceffd871
...
...
@@ -6,7 +6,7 @@
<OutputArchitecture>
neutral
</OutputArchitecture>
<OutputLocalized>
false
</OutputLocalized>
<OutputType>
vsix
</OutputType>
<OutputName>
Microsoft.FSharp.SDK
.Core
</OutputName>
<OutputName>
Microsoft.FSharp.SDK
</OutputName>
<IsPackage>
true
</IsPackage>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<BinariesFolder>
$(FSharpSourcesRoot)\..\$(Configuration)
</BinariesFolder>
...
...
setup/Swix/Microsoft.FSharp.vsmanproj
浏览文件 @
ceffd871
...
...
@@ -30,8 +30,7 @@
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Compiler.json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Compiler.Resources.%(SetupLanguages.LocaleCode).json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.SDK.Core.json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.SDK.Resources.%(SetupLanguages.LocaleCode).json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.SDK.json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Vsix.Full.Core.json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Vsix.Full.Resources.%(SetupLanguages.LocaleCode).json"
/>
...
...
setup/build-insertion.proj
浏览文件 @
ceffd871
...
...
@@ -13,18 +13,14 @@
<Target Name="CollectSetupProjects">
<ItemGroup>
<SwixSetupProjects Include="Microsoft.FSharp.SDK.
Core.
swixproj">
<ProjectPath>Swix\Microsoft.FSharp.SDK
.Core\Microsoft.FSharp.SDK.Core
.swixproj</ProjectPath>
<SwixSetupProjects Include="Microsoft.FSharp.SDK.swixproj">
<ProjectPath>Swix\Microsoft.FSharp.SDK
\Microsoft.FSharp.SDK
.swixproj</ProjectPath>
</SwixSetupProjects>
<SwixSetupProjects Include="Microsoft.FSharp.Compiler.swixproj">
<ProjectPath>Swix\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.swixproj</ProjectPath>
</SwixSetupProjects>
</ItemGroup>
<CreateItem Include="@(SetupLanguages)"
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.SDK.Resources\Microsoft.FSharp.SDK.Resources.swixproj">
<Output ItemName="SwixSetupProjects" TaskParameter="Include"/>
</CreateItem>
<CreateItem Include="@(SetupLanguages)"
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Compiler.Resources\Microsoft.FSharp.Compiler.Resources.swixproj">
<Output ItemName="SwixSetupProjects" TaskParameter="Include"/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录