Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Iot
提交
6e5659b5
I
Iot
项目概览
jobily
/
Iot
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6e5659b5
编写于
5月 22, 2019
作者:
D
dotnet-maestro[bot]
提交者:
Jose Perez Rodriguez
5月 22, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20190521.7 (#445)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19271.7
上级
3094a718
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
119 addition
and
13 deletion
+119
-13
eng/Version.Details.xml
eng/Version.Details.xml
+2
-2
eng/common/build.sh
eng/common/build.sh
+5
-0
eng/common/tools.ps1
eng/common/tools.ps1
+5
-1
eng/common/tools.sh
eng/common/tools.sh
+106
-9
global.json
global.json
+1
-1
未找到文件。
eng/Version.Details.xml
浏览文件 @
6e5659b5
...
...
@@ -11,9 +11,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.1927
0.2
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.1927
1.7
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
3b0760f8789d5d4bd146b36bd9051696d7a56bfa
</Sha>
<Sha>
7a6fb6528b2060cd9e3a3d92535f5b6fdc6b2e82
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/common/build.sh
浏览文件 @
6e5659b5
...
...
@@ -66,6 +66,7 @@ ci=false
warn_as_error
=
true
node_reuse
=
true
binary_log
=
false
pipelines_log
=
false
projects
=
''
configuration
=
'Debug'
...
...
@@ -92,6 +93,9 @@ while [[ $# > 0 ]]; do
-binarylog
|
-bl
)
binary_log
=
true
;;
-pipelineslog
|
-pl
)
pipelines_log
=
true
;;
-restore
|
-r
)
restore
=
true
;;
...
...
@@ -146,6 +150,7 @@ while [[ $# > 0 ]]; do
done
if
[[
"
$ci
"
==
true
]]
;
then
pipelines_log
=
true
binary_log
=
true
node_reuse
=
false
fi
...
...
eng/common/tools.ps1
浏览文件 @
6e5659b5
...
...
@@ -213,7 +213,11 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
if
(
$
env
:
VSINSTALLDIR
-ne
$null
)
{
$msbuildCmd
=
Get-Command
"msbuild.exe"
-ErrorAction
SilentlyContinue
if
(
$msbuildCmd
-ne
$null
)
{
if
(
$msbuildCmd
.
Version
-ge
$vsMinVersion
)
{
# Workaround for https://github.com/dotnet/roslyn/issues/35793
# Due to this issue $msbuildCmd.Version returns 0.0.0.0 for msbuild.exe 16.2+
$msbuildVersion
=
[
Version
]::
new
((
Get-Item
$msbuildCmd
.
Path
)
.
VersionInfo
.
ProductVersion
.
Split
(@(
'-'
,
'+'
))[
0
])
if
(
$msbuildVersion
-ge
$vsMinVersion
)
{
return
$
global
:
_MSBuildExe
=
$msbuildCmd
.
Path
}
...
...
eng/common/tools.sh
浏览文件 @
6e5659b5
#!/usr/bin/env bash
# Initialize variables if they aren't already defined.
# CI mode - set to true on CI server for PR validation build or official build.
ci
=
${
ci
:-
false
}
# Set to true to use the pipelines logger which will enable Azure logging output.
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
# This flag is meant as a temporary opt-opt for the feature while validate it across
# our consumers. It will be deleted in the future.
if
[[
"
$ci
"
==
true
]]
;
then
pipelines_log
=
${
pipelines_log
:-
true
}
else
pipelines_log
=
${
pipelines_log
:-
false
}
fi
# Build configuration. Common values include 'Debug' and 'Release', but the repository may use other names.
configuration
=
${
configuration
:-
'Debug'
}
...
...
@@ -40,6 +52,78 @@ else
use_global_nuget_cache
=
${
use_global_nuget_cache
:-
true
}
fi
function
EmitError
{
if
[[
"
$ci
"
!=
true
]]
;
then
echo
"
$@
"
>
&2
return
fi
message_type
=
"error"
sourcepath
=
''
linenumber
=
''
columnnumber
=
''
error_code
=
''
while
[[
$#
-gt
0
]]
;
do
opt
=
"
$(
echo
"
${
1
/#--/-
}
"
|
awk
'{print tolower($0)}'
)
"
case
"
$opt
"
in
-type
|
-t
)
message_type
=
$2
shift
;;
-sourcepath
|
-s
)
sourcepath
=
$2
shift
;;
-linenumber
|
-l
)
linenumber
=
$2
shift
;;
-columnnumber
|
-col
)
columnnumber
=
$2
shift
;;
-code
|
-c
)
error_code
=
$2
shift
;;
*
)
break
;;
esac
shift
done
message
=
'##vso[task.logissue'
message
=
"
$message
type=
$message_type
"
if
[
-n
"
$sourcepath
"
]
;
then
message
=
"
$message
;sourcepath=
$sourcepath
"
else
message
=
"
$message
;sourcepath=
${
BASH_SOURCE
[1]
}
"
fi
if
[
-n
"
$linenumber
"
]
;
then
message
=
"
$message
;linenumber=
$linenumber
"
else
message
=
"
$message
;linenumber=
${
BASH_LINENO
[0]
}
"
fi
if
[
-n
"
$columnnumber
"
]
;
then
message
=
"
$message
;columnnumber=
$columnnumber
"
fi
if
[
-n
"
$error_code
"
]
;
then
message
=
"
$message
;code=
$error_code
"
fi
message
=
"
$message
]
$*
"
echo
"
$message
"
}
# Resolve any symlinks in the given path.
function
ResolvePath
{
local
path
=
$1
...
...
@@ -65,7 +149,7 @@ function ReadGlobalVersion {
local
pattern
=
"
\"
$key
\"
*: *
\"
(.*)
\"
"
if
[[
!
$line
=
~
$pattern
]]
;
then
echo
"Error: Cannot find
\"
$key
\"
in
$global_json_file
"
>
&2
EmitError
"Error: Cannot find
\"
$key
\"
in
$global_json_file
"
ExitWithExitCode 1
fi
...
...
@@ -126,7 +210,7 @@ function InitializeDotNetCli {
if
[[
"
$install
"
==
true
]]
;
then
InstallDotNetSdk
"
$dotnet_root
"
"
$dotnet_sdk_version
"
else
echo
"Unable to find dotnet with SDK version '
$dotnet_sdk_version
'"
>
&2
EmitError
"Unable to find dotnet with SDK version '
$dotnet_sdk_version
'"
ExitWithExitCode 1
fi
fi
...
...
@@ -179,7 +263,7 @@ function InstallDotNet {
fi
bash
"
$install_script
"
--version
$version
--install-dir
"
$root
"
$archArg
$runtimeArg
$skipNonVersionedFilesArg
||
{
local
exit_code
=
$?
echo
"Failed to install dotnet SDK (exit code '
$exit_code
')."
>
&2
EmitError
"Failed to install dotnet SDK (exit code '
$exit_code
')."
ExitWithExitCode
$exit_code
}
}
...
...
@@ -216,6 +300,7 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool
=
"
$_InitializeDotNetCli
/dotnet"
_InitializeBuildToolCommand
=
"msbuild"
_InitializeBuildToolFramework
=
"netcoreapp2.1"
}
function
GetNuGetPackageCachePath
{
...
...
@@ -264,7 +349,7 @@ function InitializeToolset {
fi
if
[[
"
$restore
"
!=
true
]]
;
then
echo
"Toolset version
$toolsetVersion
has not been restored."
>
&2
EmitError
"Toolset version
$toolsetVersion
has not been restored."
ExitWithExitCode 2
fi
...
...
@@ -276,12 +361,12 @@ function InitializeToolset {
fi
echo
'<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>'
>
"
$proj
"
MSBuild
"
$proj
"
$bl
/t:__WriteToolsetLocation /clp:ErrorsOnly
\;
NoSummary /p:__ToolsetLocationOutputFile
=
"
$toolset_location_file
"
MSBuild
-Core
"
$proj
"
$bl
/t:__WriteToolsetLocation /clp:ErrorsOnly
\;
NoSummary /p:__ToolsetLocationOutputFile
=
"
$toolset_location_file
"
local
toolset_build_proj
=
`
cat
"
$toolset_location_file
"
`
if
[[
!
-a
"
$toolset_build_proj
"
]]
;
then
echo
"Invalid toolset path:
$toolset_build_proj
"
>
&2
EmitError
"Invalid toolset path:
$toolset_build_proj
"
ExitWithExitCode 3
fi
...
...
@@ -304,14 +389,26 @@ function StopProcesses {
}
function
MSBuild
{
args
=
$@
if
[[
"
$pipelines_log
"
==
true
]]
;
then
InitializeBuildTool
InitializeToolset
_toolset_dir
=
"
${
_InitializeToolset
%/*
}
"
_loggerPath
=
"
$_toolset_dir
/
$_InitializeBuildToolFramework
/Microsoft.DotNet.Arcade.Sdk.dll"
args
=(
"
${
args
[@]
}
"
"-logger:
$_loggerPath
"
)
fi
MSBuild-Core
${
args
[@]
}
}
function
MSBuild-Core
{
if
[[
"
$ci
"
==
true
]]
;
then
if
[[
"
$binary_log
"
!=
true
]]
;
then
echo
"Binary log must be enabled in CI build."
>
&2
EmitError
"Binary log must be enabled in CI build."
ExitWithExitCode 1
fi
if
[[
"
$node_reuse
"
==
true
]]
;
then
echo
"Node reuse must be disabled in CI build."
>
&2
EmitError
"Node reuse must be disabled in CI build."
ExitWithExitCode 1
fi
fi
...
...
@@ -325,7 +422,7 @@ function MSBuild {
"
$_InitializeBuildTool
"
"
$_InitializeBuildToolCommand
"
/m /nologo /clp:Summary /v:
$verbosity
/nr:
$node_reuse
$warnaserror_switch
/p:TreatWarningsAsErrors
=
$warn_as_error
/p:ContinuousIntegrationBuild
=
$ci
"
$@
"
||
{
local
exit_code
=
$?
echo
"Build failed (exit code '
$exit_code
')."
>
&2
EmitError
"Build failed (exit code '
$exit_code
')."
ExitWithExitCode
$exit_code
}
}
...
...
global.json
浏览文件 @
6e5659b5
...
...
@@ -11,6 +11,6 @@
"version"
:
"3.0.100-preview5-011568"
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.1927
0.2
"
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.1927
1.7
"
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录