Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
c7bb120c
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,发现更多精彩内容 >>
未验证
提交
c7bb120c
编写于
10月 04, 2018
作者:
T
Tomáš Matoušek
提交者:
GitHub
10月 04, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move ILAsm publishing to a project (#30255)
上级
0021a8d6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
56 addition
and
18 deletion
+56
-18
build/scripts/build.ps1
build/scripts/build.ps1
+0
-5
build/scripts/tests.sh
build/scripts/tests.sh
+0
-13
src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj
src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj
+8
-0
src/Tools/ILAsm/DeployILAsm.targets
src/Tools/ILAsm/DeployILAsm.targets
+48
-0
未找到文件。
build/scripts/build.ps1
浏览文件 @
c7bb120c
...
@@ -338,11 +338,6 @@ function Test-Determinism() {
...
@@ -338,11 +338,6 @@ function Test-Determinism() {
}
}
function Test-XUnitCoreClr() {
function Test-XUnitCoreClr() {
Write-Host "
Publishing
ILAsm.csproj
"
$toolsDir
= Join-Path
$binariesDir
"
Tools
"
$ilasmDir
= Join-Path
$toolsDir
"
ILAsm
"
Exec-Console
$dotnet
"
publish
src\Tools\ILAsm
--no-restore
--runtime
win-x64
--self-contained
-o
$ilasmDir
"
$unitDir
= Join-Path
$configDir
"
UnitTests
"
$unitDir
= Join-Path
$configDir
"
UnitTests
"
$tf
= "
netcoreapp2.1
"
$tf
= "
netcoreapp2.1
"
$xunitResultDir
= Join-Path
$unitDir
"
xUnitResults
"
$xunitResultDir
= Join-Path
$unitDir
"
xUnitResults
"
...
...
build/scripts/tests.sh
浏览文件 @
c7bb120c
...
@@ -78,19 +78,6 @@ else
...
@@ -78,19 +78,6 @@ else
exit
1
exit
1
fi
fi
UNAME
=
"
$(
uname
)
"
if
[
"
$UNAME
"
==
"Darwin"
]
;
then
runtime_id
=
osx-x64
elif
[
"
$UNAME
"
==
"Linux"
]
;
then
runtime_id
=
linux-x64
else
echo
"Unknown OS:
$UNAME
"
1>&2
exit
1
fi
echo
"Publishing ILAsm.csproj"
dotnet publish
"
${
root_path
}
/src/Tools/ILAsm"
--no-restore
--runtime
${
runtime_id
}
--self-contained
-o
"
${
binaries_path
}
/Tools/ILAsm"
echo
"Using
${
xunit_console
}
"
echo
"Using
${
xunit_console
}
"
# Discover and run the tests
# Discover and run the tests
...
...
src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj
浏览文件 @
c7bb120c
...
@@ -12,6 +12,12 @@
...
@@ -12,6 +12,12 @@
<RootNamespace></RootNamespace>
<RootNamespace></RootNamespace>
<DisableImplicitFrameworkReferences>
false
</DisableImplicitFrameworkReferences>
<DisableImplicitFrameworkReferences>
false
</DisableImplicitFrameworkReferences>
<IsShipping>
false
</IsShipping>
<IsShipping>
false
</IsShipping>
<!--
Directory where to deploy ILAsm when targeting .NET Core app.
IlasmUtilities relies on ILAsm being deployed to this location.
-->
<IlasmPublishDir>
$(ArtifactsDir)Tools\ILAsm\
</IlasmPublishDir>
</PropertyGroup>
</PropertyGroup>
<ItemGroup
Label=
"Project References"
>
<ItemGroup
Label=
"Project References"
>
<ProjectReference
Include=
"..\..\..\Compilers\Test\Resources\Core\Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj"
/>
<ProjectReference
Include=
"..\..\..\Compilers\Test\Resources\Core\Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj"
/>
...
@@ -103,4 +109,6 @@
...
@@ -103,4 +109,6 @@
<ItemGroup
Condition=
"'$(TargetFramework)' == 'net46'"
>
<ItemGroup
Condition=
"'$(TargetFramework)' == 'net46'"
>
<PackageReference
Include=
"ICSharpCode.Decompiler"
Version=
"$(ICSharpCodeDecompilerVersion)"
/>
<PackageReference
Include=
"ICSharpCode.Decompiler"
Version=
"$(ICSharpCodeDecompilerVersion)"
/>
</ItemGroup>
</ItemGroup>
<Import
Project=
"..\..\..\Tools\ILAsm\DeployILAsm.targets"
/>
</Project>
</Project>
\ No newline at end of file
src/Tools/ILAsm/DeployILAsm.targets
0 → 100644
浏览文件 @
c7bb120c
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project>
<Choose>
<When
Condition=
"'$(OS)' == 'Windows_NT'"
>
<PropertyGroup>
<_IlasmRid>
win-x64
</_IlasmRid>
</PropertyGroup>
</When>
<When
Condition=
"'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'"
>
<PropertyGroup>
<_IlasmRid>
osx-x64
</_IlasmRid>
</PropertyGroup>
</When>
<When
Condition=
"'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'"
>
<PropertyGroup>
<_IlasmRid>
linux-x64
</_IlasmRid>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<_IlasmRid
/>
</PropertyGroup>
</Otherwise>
</Choose>
<PropertyGroup>
<_IlasmDeployProj>
$(MSBuildThisFileDirectory)IlAsmDeploy.csproj
</_IlasmDeployProj>
<_IlasmIncrementalBuildMarker>
$(IlasmPublishDir).v$(MicrosoftNETCoreILAsmVersion)
</_IlasmIncrementalBuildMarker>
</PropertyGroup>
<Target
Name=
"_PublishILAsm"
AfterTargets=
"Build"
Inputs=
"$(MSBuildThisFileFullPath);$(_IlasmDeployProj)"
Outputs=
"$(_IlasmIncrementalBuildMarker)"
Condition=
"'$(TargetFramework)' == 'netcoreapp2.1'"
>
<Error
Text=
"Unknown OS"
Condition=
"'$(_IlasmRid)' == ''"
/>
<MSBuild
Projects=
"$(_IlasmDeployProj)"
Targets=
"Publish"
Properties=
"SelfContained=true;RuntimeIdentifier=$(_IlasmRid);PublishDir=$(IlasmPublishDir)"
/>
<Touch
Files=
"$(_IlasmIncrementalBuildMarker)"
AlwaysCreate=
"true"
>
<Output
TaskParameter=
"TouchedFiles"
ItemName=
"FileWrites"
/>
</Touch>
</Target>
</Project>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录