Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
d65c1308
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d65c1308
编写于
10月 15, 2015
作者:
A
Andy Gocke
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6004 from agocke/UsePortable50
Switch our CoreCLR projects to be ".NETPortable,v5.0"
上级
e0734a8e
1cb101ee
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
21 addition
and
31 deletion
+21
-31
build/Targets/VSL.Imports.targets
build/Targets/VSL.Imports.targets
+9
-24
cibuild.sh
cibuild.sh
+2
-2
src/Compilers/CSharp/CscCore/CscCore.csproj
src/Compilers/CSharp/CscCore/CscCore.csproj
+3
-1
src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
+2
-1
src/Interactive/CsiCore/CsiCore.csproj
src/Interactive/CsiCore/CsiCore.csproj
+3
-2
src/Interactive/VbiCore/VbiCore.vbproj
src/Interactive/VbiCore/VbiCore.vbproj
+2
-1
未找到文件。
build/Targets/VSL.Imports.targets
浏览文件 @
d65c1308
...
@@ -49,30 +49,6 @@
...
@@ -49,30 +49,6 @@
</When>
</When>
</Choose>
</Choose>
<!-- Work around mono + msbuild bug https://github.com/Microsoft/msbuild/issues/191 -->
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'DNXCore' and '$(OS)' != 'Windows_NT'">
<!-- Manually set assembly search paths so they don't get mangled later -->
<AssemblySearchPaths Condition=" '$(AssemblySearchPaths)' == ''">
{RawFileName};
$(OutDir)
</AssemblySearchPaths>
<RemoveAssemblyFoldersIfNoTargetFramework>false</RemoveAssemblyFoldersIfNoTargetFramework>
</PropertyGroup>
<!-- Work around issue in dotnet/roslyn issue #5213
Since MSBuild wants a reference assembly location and DNXCore doesn't have one,
trick MSBuild into using the .NETPortable,v5.0 reference assembly path which happens
to have the same set of reference assemblies as DNXCore (i.e., none). -->
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'DNXCore'">
<_TargetFrameworkDirectories>$([System.String]::Join(";", $([Microsoft.Build.Utilities.ToolLocationHelper]::GetPathToReferenceAssemblies(".NETPortable", "v5.0", ""))))</_TargetFrameworkDirectories>
<_FullFrameworkReferenceAssemblyPaths>$(_TargetFrameworkDirectories)</_FullFrameworkReferenceAssemblyPaths>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'DNXCore'">
<BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win7</BaseNuGetRuntimeIdentifier>
<BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Unix'">ubuntu.14.04</BaseNuGetRuntimeIdentifier>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.VisualBasic.targets"
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.VisualBasic.targets"
Condition="'$(ProjectLanguage)' == 'VB' And '$(TargetFrameworkIdentifier)' == '.NETPortable'"/>
Condition="'$(ProjectLanguage)' == 'VB' And '$(TargetFrameworkIdentifier)' == '.NETPortable'"/>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets"
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets"
...
@@ -89,6 +65,15 @@
...
@@ -89,6 +65,15 @@
<Import Project="$(MSBuildExtensionsPath)\Microsoft\NuGet\Microsoft.NuGet.targets"
<Import Project="$(MSBuildExtensionsPath)\Microsoft\NuGet\Microsoft.NuGet.targets"
Condition="'$(OS)' != 'Windows_NT'" />
Condition="'$(OS)' != 'Windows_NT'" />
<PropertyGroup Condition="
'$(TargetFrameworkIdentifier)' == '.NETPortable' AND
'$(TargetFrameworkVersion)' == 'v5.0' AND
'$(OutputType)' == 'Exe'">
<NuGetTargetMoniker>DNXCore,Version=v5.0</NuGetTargetMoniker>
<BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win7</BaseNuGetRuntimeIdentifier>
<BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Unix'">ubuntu.14.04</BaseNuGetRuntimeIdentifier>
</PropertyGroup>
<!-- It looks like MSBuild has a bug on *nix where they aggressively
<!-- It looks like MSBuild has a bug on *nix where they aggressively
directory separators from '\' to '/', even when the '\'
directory separators from '\' to '/', even when the '\'
is being used as an escape character in a define constant in VB.
is being used as an escape character in a define constant in VB.
...
...
cibuild.sh
浏览文件 @
d65c1308
...
@@ -205,9 +205,9 @@ set_mono_path()
...
@@ -205,9 +205,9 @@ set_mono_path()
fi
fi
if
[
"
$OS_NAME
"
=
"Darwin"
]
;
then
if
[
"
$OS_NAME
"
=
"Darwin"
]
;
then
MONO_TOOLSET_NAME
=
mono.mac.
3
MONO_TOOLSET_NAME
=
mono.mac.
4
elif
[
"
$OS_NAME
"
=
"Linux"
]
;
then
elif
[
"
$OS_NAME
"
=
"Linux"
]
;
then
MONO_TOOLSET_NAME
=
mono.linux.
3
MONO_TOOLSET_NAME
=
mono.linux.
4
else
else
echo
"Error: Unsupported OS
$OS_NAME
"
echo
"Error: Unsupported OS
$OS_NAME
"
exit
1
exit
1
...
...
src/Compilers/CSharp/CscCore/CscCore.csproj
浏览文件 @
d65c1308
...
@@ -18,8 +18,10 @@
...
@@ -18,8 +18,10 @@
<OutDir>
$(OutDir)core-clr\
</OutDir>
<OutDir>
$(OutDir)core-clr\
</OutDir>
<RestorePackages>
true
</RestorePackages>
<RestorePackages>
true
</RestorePackages>
<AutoGenerateBindingRedirects>
True
</AutoGenerateBindingRedirects>
<AutoGenerateBindingRedirects>
True
</AutoGenerateBindingRedirects>
<TargetFrameworkIdentifier>
DNXCore
</TargetFrameworkIdentifier>
<ProjectTypeGuids>
{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
</ProjectTypeGuids>
<TargetFrameworkIdentifier>
.NETPortable
</TargetFrameworkIdentifier>
<TargetFrameworkVersion>
v5.0
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v5.0
</TargetFrameworkVersion>
<!-- Misspelling, bug in NuGet targets -->
<!-- Misspelling, bug in NuGet targets -->
<RuntimeIndentifier>
x64
</RuntimeIndentifier>
<RuntimeIndentifier>
x64
</RuntimeIndentifier>
<NuGetRuntimeIdentifier>
$(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier)
</NuGetRuntimeIdentifier>
<NuGetRuntimeIdentifier>
$(BaseNuGetRuntimeIdentifier)-$(RuntimeIndentifier)
</NuGetRuntimeIdentifier>
...
...
src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
浏览文件 @
d65c1308
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
<OutDir>
$(OutDir)core-clr\
</OutDir>
<OutDir>
$(OutDir)core-clr\
</OutDir>
<RestorePackages>
true
</RestorePackages>
<RestorePackages>
true
</RestorePackages>
<AutoGenerateBindingRedirects>
True
</AutoGenerateBindingRedirects>
<AutoGenerateBindingRedirects>
True
</AutoGenerateBindingRedirects>
<TargetFrameworkIdentifier>
DNXCore
</TargetFrameworkIdentifier>
<ProjectTypeGuids>
{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
</ProjectTypeGuids>
<TargetFrameworkIdentifier>
.NETPortable
</TargetFrameworkIdentifier>
<TargetFrameworkVersion>
v5.0
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v5.0
</TargetFrameworkVersion>
<!-- Misspelling, bug in NuGet targets -->
<!-- Misspelling, bug in NuGet targets -->
<RuntimeIndentifier>
x64
</RuntimeIndentifier>
<RuntimeIndentifier>
x64
</RuntimeIndentifier>
...
...
src/Interactive/CsiCore/CsiCore.csproj
浏览文件 @
d65c1308
...
@@ -16,7 +16,8 @@
...
@@ -16,7 +16,8 @@
<OutDir>
$(OutDir)core-clr\
</OutDir>
<OutDir>
$(OutDir)core-clr\
</OutDir>
<RestorePackages>
true
</RestorePackages>
<RestorePackages>
true
</RestorePackages>
<AutoGenerateBindingRedirects>
True
</AutoGenerateBindingRedirects>
<AutoGenerateBindingRedirects>
True
</AutoGenerateBindingRedirects>
<TargetFrameworkIdentifier>
DNXCore
</TargetFrameworkIdentifier>
<ProjectTypeGuids>
{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
</ProjectTypeGuids>
<TargetFrameworkIdentifier>
.NETPortable
</TargetFrameworkIdentifier>
<TargetFrameworkVersion>
v5.0
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v5.0
</TargetFrameworkVersion>
<NoStdLib>
true
</NoStdLib>
<NoStdLib>
true
</NoStdLib>
</PropertyGroup>
</PropertyGroup>
...
@@ -54,4 +55,4 @@
...
@@ -54,4 +55,4 @@
<ImportGroup
Label=
"Targets"
>
<ImportGroup
Label=
"Targets"
>
<Import
Project=
"..\..\..\build\Targets\VSL.Imports.targets"
/>
<Import
Project=
"..\..\..\build\Targets\VSL.Imports.targets"
/>
</ImportGroup>
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
src/Interactive/VbiCore/VbiCore.vbproj
浏览文件 @
d65c1308
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
<OutDir>
$(OutDir)core-clr\
</OutDir>
<OutDir>
$(OutDir)core-clr\
</OutDir>
<RestorePackages>
true
</RestorePackages>
<RestorePackages>
true
</RestorePackages>
<AutoGenerateBindingRedirects>
True
</AutoGenerateBindingRedirects>
<AutoGenerateBindingRedirects>
True
</AutoGenerateBindingRedirects>
<TargetFrameworkIdentifier>
DNXCore
</TargetFrameworkIdentifier>
<ProjectTypeGuids>
{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}
</ProjectTypeGuids>
<TargetFrameworkIdentifier>
.NETPortable
</TargetFrameworkIdentifier>
<TargetFrameworkVersion>
v5.0
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v5.0
</TargetFrameworkVersion>
<NoStdLib>
true
</NoStdLib>
<NoStdLib>
true
</NoStdLib>
</PropertyGroup>
</PropertyGroup>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录