Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
656578c9
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,发现更多精彩内容 >>
提交
656578c9
编写于
5月 10, 2016
作者:
O
Omar Tawfik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove private assemblies from wix projects
上级
549f0c04
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
0 addition
and
77 deletion
+0
-77
setup/Common.Wix.Properties.wxs
setup/Common.Wix.Properties.wxs
+0
-1
setup/FSharp.SDK/FSharp.SDK.wixproj
setup/FSharp.SDK/FSharp.SDK.wixproj
+0
-1
setup/FSharp.SDK/FSharp.SDK.wxs
setup/FSharp.SDK/FSharp.SDK.wxs
+0
-1
setup/FSharp.SDK/component-groups/Compiler_PrivateAssemblies.wxs
...Sharp.SDK/component-groups/Compiler_PrivateAssemblies.wxs
+0
-65
vsintegration/update-vsintegration.cmd
vsintegration/update-vsintegration.cmd
+0
-9
未找到文件。
setup/Common.Wix.Properties.wxs
浏览文件 @
656578c9
...
...
@@ -39,7 +39,6 @@
<Directory
Id=
"VS15_ROOT_FOLDER"
Name=
"VS15_ROOT_FOLDER"
>
<Directory
Id=
"VS15_Common7"
Name=
"Common7"
>
<Directory
Id=
"VS15_Common7_IDE"
Name=
"IDE"
>
<Directory
Id=
"VS15_Common7_IDE_PrivateAssemblies"
Name=
"PrivateAssemblies"
/>
<Directory
Id=
"VS15_Common7_IDE_PublicAssemblies"
Name=
"PublicAssemblies"
/>
</Directory>
</Directory>
...
...
setup/FSharp.SDK/FSharp.SDK.wixproj
浏览文件 @
656578c9
...
...
@@ -46,7 +46,6 @@
<Compile
Include=
"component-groups\Redist_ManagedFiles.wxs"
/>
<Compile
Include=
"component-groups\Compiler_SDK.wxs"
/>
<Compile
Include=
"component-groups\Compiler_OtherResources.wxs"
/>
<Compile
Include=
"component-groups\Compiler_PrivateAssemblies.wxs"
/>
<Compile
Include=
"component-groups\Compiler_PublicAssemblies.wxs"
/>
<Compile
Include=
"component-groups\Langpack_ManagedFiles.wxs"
/>
</ItemGroup>
...
...
setup/FSharp.SDK/FSharp.SDK.wxs
浏览文件 @
656578c9
...
...
@@ -29,7 +29,6 @@
<ComponentGroupRef
Id=
"Compiler_SDK"
/>
<ComponentGroupRef
Id=
"Compiler_OtherResources"
/>
<ComponentGroupRef
Id=
"Compiler_PrivateAssemblies"
/>
<ComponentGroupRef
Id=
"Compiler_PublicAssemblies"
/>
</Feature>
...
...
setup/FSharp.SDK/component-groups/Compiler_PrivateAssemblies.wxs
已删除
100644 → 0
浏览文件 @
549f0c04
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Wix
xmlns=
"http://schemas.microsoft.com/wix/2006/wi"
xmlns:NetFx=
"http://schemas.microsoft.com/wix/NetFxExtension"
>
<Fragment>
<PropertyRef
Id=
"VS15_ROOT_FOLDER"
/>
<PropertyRef
Id=
"MSBUILD15_ROOT_FOLDER"
/>
<ComponentGroup
Id=
"Compiler_PrivateAssemblies"
>
<ComponentRef
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.dll"
/>
<ComponentRef
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.dll"
/>
<ComponentRef
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.dll"
/>
<ComponentRef
Id=
"Compiler_PrivateAssemblies_FSharp.Core.dll"
/>
<?if $(var.Lang) != ENU ?>
<ComponentRef
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.dll_$(var.Lang)"
/>
<ComponentRef
Id=
"Compiler_PrivateAssemblies_FSharp.Core.dll_$(var.Lang)"
/>
<?endif ?>
</ComponentGroup>
<DirectoryRef
Id=
"VS15_Common7_IDE_PrivateAssemblies"
>
<Component
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.dll"
Guid=
"$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Compiler.dll, $(var.Lang)))"
>
<File
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.dll"
Source=
"$(var.BinariesDir)\net40\bin\FSharp.Compiler.dll"
KeyPath=
"yes"
>
<NetFx:NativeImage
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.Native.dll"
Priority=
"0"
Dependencies=
"no"
Platform=
"all"
/>
</File>
</Component>
<Component
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.dll"
Guid=
"$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.dll, $(var.Lang)))"
>
<File
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.dll"
Source=
"$(var.BinariesDir)\net40\bin\FSharp.Compiler.Interactive.Settings.dll"
KeyPath=
"yes"
>
<NetFx:NativeImage
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.Native.d"
Priority=
"0"
Dependencies=
"no"
Platform=
"all"
/>
</File>
</Component>
<Component
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.dll"
Guid=
"$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.dll, $(var.Lang)))"
>
<File
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.dll"
Source=
"$(var.BinariesDir)\net40\bin\FSharp.Compiler.Server.Shared.dll"
KeyPath=
"yes"
>
<NetFx:NativeImage
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.Native.dll"
Priority=
"0"
Dependencies=
"no"
Platform=
"all"
/>
</File>
</Component>
<Component
Id=
"Compiler_PrivateAssemblies_FSharp.Core.dll"
Guid=
"$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Core.dll, $(var.Lang)))"
>
<File
Id=
"Compiler_PrivateAssemblies_FSharp.Core.dll"
Source=
"$(var.BinariesDir)\net40\bin\FSharp.Core.dll"
KeyPath=
"yes"
>
<NetFx:NativeImage
Id=
"Compiler_PrivateAssemblies_FSharp.Core.Native.dll"
Priority=
"0"
Dependencies=
"no"
Platform=
"all"
/>
</File>
<File
Id=
"Compiler_PrivateAssemblies_FSharp.Core.sigdata"
Source=
"$(var.BinariesDir)\net40\bin\FSharp.Core.sigdata"
/>
<File
Id=
"Compiler_PrivateAssemblies_FSharp.Core.optdata"
Source=
"$(var.BinariesDir)\net40\bin\FSharp.Core.optdata"
/>
</Component>
<?if $(var.Lang) != ENU ?>
<Component
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.dll_$(var.Lang)"
Guid=
"$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Compiler.dll_$(var.Lang), $(var.Lang)))"
>
<File
Id=
"Compiler_PrivateAssemblies_FSharp.Compiler.dll_$(var.Lang)"
Source=
"$(var.BinariesDir)\net40\bin\localize\$(var.Lang)\FSharp.Compiler.resources.dll"
/>
</Component>
<Component
Id=
"Compiler_PrivateAssemblies_FSharp.Core.dll_$(var.Lang)"
Guid=
"$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Core.dll_$(var.Lang), $(var.Lang)))"
>
<File
Id=
"Compiler_PrivateAssemblies_FSharp.Core.dll_$(var.Lang)"
Source=
"$(var.BinariesDir)\net40\bin\localize\$(var.Lang)\FSharp.Core.resources.dll"
/>
</Component>
<?endif ?>
</DirectoryRef>
</Fragment>
</Wix>
\ No newline at end of file
vsintegration/update-vsintegration.cmd
浏览文件 @
656578c9
...
...
@@ -138,15 +138,6 @@ if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
%SN6
4
%
-Vr
VisualFSharp
.Salsa
,
b03f5f7f11d50a3a
)
if
exist
"
%ProgramFiles
(x86)
%
\Microsoft Visual Studio
%VisualStudioVersion%
\Common7\IDE\PrivateAssemblies"
(
copy
/y
%BINDIR%
\FSharp.Compiler.Server.Shared.dll
"
%ProgramFiles
(x86)
%
\Microsoft Visual Studio
%VisualStudioVersion%
\Common7\IDE\PrivateAssemblies\FSharp.Compiler.Server.Shared.dll"
copy
/y
%BINDIR%
\FSharp.Compiler.Interactive.Settings.dll
"
%ProgramFiles
(x86)
%
\Microsoft Visual Studio
%VisualStudioVersion%
\Common7\IDE\PrivateAssemblies\FSharp.Compiler.Interactive.Settings.dll"
)
if
exist
"
%ProgramFiles%
\Microsoft Visual Studio
%VisualStudioVersion%
\Common7\IDE\PrivateAssemblies"
(
copy
/y
%BINDIR%
\FSharp.Compiler.Server.Shared.dll
"
%ProgramFiles%
\Microsoft Visual Studio
%VisualStudioVersion%
\Common7\IDE\PrivateAssemblies\FSharp.Compiler.Server.Shared.dll"
copy
/y
%BINDIR%
\FSharp.Compiler.Interactive.Settings.dll
"
%ProgramFiles%
\Microsoft Visual Studio
%VisualStudioVersion%
\Common7\IDE\PrivateAssemblies\FSharp.Compiler.Interactive.Settings.dll"
)
rem NGen fsc, fsi, fsiAnyCpu, and FSharp.Build.dll
"
%NGEN3
2
%
"
install
"
%COMPILERSDKPATH%
\fsc.exe"
/queue
:1
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录