Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
4fd056df
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,发现更多精彩内容 >>
未验证
提交
4fd056df
编写于
11月 17, 2017
作者:
J
Jared Parsons
提交者:
GitHub
11月 17, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #23249 from dotnet/dev/jaredpar/fix-blob
Publishing to blob storage
上级
14aed138
50100ebc
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
93 addition
and
5 deletion
+93
-5
build/Targets/Packages.props
build/Targets/Packages.props
+1
-0
build/ToolsetPackages/BaseToolset.csproj
build/ToolsetPackages/BaseToolset.csproj
+1
-0
src/Tools/MicroBuild/Build.proj
src/Tools/MicroBuild/Build.proj
+3
-1
src/Tools/MicroBuild/PublishBlobAssets.proj
src/Tools/MicroBuild/PublishBlobAssets.proj
+27
-0
src/Tools/MicroBuild/microbuild.ps1
src/Tools/MicroBuild/microbuild.ps1
+17
-4
src/Tools/MicroBuild/publish-blob.ps1
src/Tools/MicroBuild/publish-blob.ps1
+44
-0
未找到文件。
build/Targets/Packages.props
浏览文件 @
4fd056df
...
...
@@ -42,6 +42,7 @@
<MicrosoftDiaSymReaderPortablePdbVersion>
1.4.0
</MicrosoftDiaSymReaderPortablePdbVersion>
<MicrosoftDotNetIBCMerge>
4.7.2-alpha-00001
</MicrosoftDotNetIBCMerge>
<MicrosoftDotNetVersionToolsVersion>
1.0.27-prerelease-01811-02
</MicrosoftDotNetVersionToolsVersion>
<MicrosoftDotNetBuildTasksFeedVersion>
1.0.0-prerelease-02202-02
</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftIdentityModelClientsActiveDirectoryVersion>
3.13.8
</MicrosoftIdentityModelClientsActiveDirectoryVersion>
<MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>
15.0.26606-alpha
</MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>
<MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>
14.3.25407-alpha
</MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>
...
...
build/ToolsetPackages/BaseToolset.csproj
浏览文件 @
4fd056df
...
...
@@ -12,6 +12,7 @@
<PackageReference Include="MicroBuild.Plugins.SwixBuild" Version="$(MicroBuildPluginsSwixBuildVersion)" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
<PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" />
<PackageReference Include="Microsoft.NETCore.Compilers" Version="$(MicrosoftNETCoreCompilersVersion)" />
<PackageReference Include="Microsoft.Net.RoslynDiagnostics" Version="$(MicrosoftNetRoslynDiagnosticsVersion)" />
...
...
src/Tools/MicroBuild/Build.proj
浏览文件 @
4fd056df
...
...
@@ -13,7 +13,9 @@
<ScriptArgs
Condition=
"'$(PB_SkipTests)' != 'true'"
>
$(ScriptArgs) -testDesktop
</ScriptArgs>
<ScriptArgs
Condition=
"'$(PB_SignType)' == 'real'"
>
$(ScriptArgs) -signType "real"
</ScriptArgs>
<ScriptArgs
Condition=
"'$(PB_SignType)' == 'test'"
>
$(ScriptArgs) -signType "test"
</ScriptArgs>
<ScriptArgs
Condition=
"$(PB_PublishType.Contains('vsts'))"
>
$(ScriptArgs) -publish
</ScriptArgs>
<ScriptArgs
Condition=
"'$(PB_PublishType)' == 'vsts'"
>
$(ScriptArgs) -publishType "vsts"
</ScriptArgs>
<ScriptArgs
Condition=
"'$(PB_PublishType)' == 'blob'"
>
$(ScriptArgs) -publishType "blob"
</ScriptArgs>
<ScriptArgs
Condition=
"'$(PB_PublishBlobFeedUrl)' != ''"
>
$(ScriptArgs) -blobFeedUrl $(PB_PublishBlobFeedUrl) -blobFeedKey $(PB_PublishBlobFeedKey)
</ScriptArgs>
</PropertyGroup>
<Target
Name=
"Build"
>
...
...
src/Tools/MicroBuild/PublishBlobAssets.proj
0 → 100644
浏览文件 @
4fd056df
<Project>
<Import Project="..\..\..\build\Targets\Versions.props" />
<Import Project="..\..\..\build\Targets\Packages.props" />
<PropertyGroup>
<PublishOverwrite Condition="'$(PublishOverwrite)' == ''">false</PublishOverwrite>
</PropertyGroup>
<!--
This is for the internal orchestrated build scenarios and will likely never be run on a
developer's machine. The official build definition builds this file directly.
-->
<Import Project="$(NuGetPackageRoot)\Microsoft.DotNet.Build.Tasks.Feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" />
<ItemGroup>
<ItemsToPush Include="$(OutputPath)\NuGet\**\*.nupkg" />
</ItemGroup>
<Target Name="Build">
<PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
AccountKey="$(AccountKey)"
ItemsToPush="@(ItemsToPush)"
Overwrite="$(PublishOverwrite)" />
</Target>
</Project>
src/Tools/MicroBuild/microbuild.ps1
浏览文件 @
4fd056df
...
...
@@ -7,7 +7,7 @@ param (
[
switch
]
$cibuild
=
$false
,
[
string
]
$branchName
=
"master"
,
[
switch
]
$testDesktop
=
$false
,
[
s
witch
]
$publish
=
$false
,
[
s
tring
]
$publishType
=
""
,
[
switch
]
$help
=
$false
,
[
string
]
$signType
=
""
,
...
...
@@ -17,6 +17,8 @@ param (
[
string
]
$gitHubUserName
=
""
,
[
string
]
$gitHubToken
=
""
,
[
string
]
$gitHubEmail
=
""
,
[
string
]
$blobFeedUrl
=
""
,
[
string
]
$blobFeedKey
=
""
,
[
parameter
(
ValueFromRemainingArguments
=
$true
)]
$badArgs
)
Set-StrictMode
-version
2.0
...
...
@@ -30,9 +32,10 @@ function Print-Usage() {
Write-Host
" -msbuildDir MSBuild to use for operations"
Write-Host
" -cibuild Run CI specific operations"
Write-Host
" -testDesktop Run unit tests"
Write-Host
" -publish
Run the pubish step
"
Write-Host
" -publish
Type Publish to run: vsts, blob or none (default is none)
"
Write-Host
" -branchName Branch being built"
Write-Host
" -nugetApiKey Key for NuGet publishing"
Write-Host
" -signType Signing type: real, test or public (default is public)"
Write-Host
" -help Print this message"
}
...
...
@@ -133,8 +136,18 @@ try {
Get-Process
vbcscompiler
-ErrorAction
SilentlyContinue
|
Stop-Process
if
(
$publish
)
{
switch
(
$publishType
)
{
"vsts"
{
Exec-Block
{
&
.
\publish-assets.ps1
-configDir
$configDir
-branchName
$branchName
-mygetApiKey
$mygetApiKey
-nugetApiKey
$nugetApiKey
-gitHubUserName
$githubUserName
-gitHubToken
$gitHubToken
-gitHubEmail
$gitHubEmail
-test
:
$
(
-not
$official
)
}
break
;
}
"blob"
{
Exec-Block
{
&
.
\publish-blob.ps1
-configDir
$configDir
-blobFeedUrl
$blobFeedUrl
-blobFeedKey
$blobFeedKey
}
break
;
}
default
{
break
;
}
}
exit
0
...
...
src/Tools/MicroBuild/publish-blob.ps1
0 → 100644
浏览文件 @
4fd056df
# Publishes our assets to our blob containers
#
# Repeatable is important here because we have to assume that publishes can and will fail with some
# degree of regularity.
[
CmdletBinding
(
PositionalBinding
=
$false
)]
Param
(
# Standard options
[
string
]
$configDir
=
""
,
# Credentials
[
string
]
$blobFeedUrl
=
""
,
[
string
]
$blobFeedKey
=
""
)
Set-StrictMode
-version
2.0
$Error
ActionPreference
=
"Stop"
try
{
.
(
Join-Path
$PSScriptRoot
"..\..\..\build\scripts\build-utils.ps1"
)
$msbuild
,
$msbuildDir
=
Ensure-MSBuildAndDir
-msbuildDir
$msbuildDir
if
(
$blobFeedUrl
-eq
""
)
{
Write-Host
"Need a value for -blobFeedUrl"
exit
1
}
if
(
$blobFeedKey
-eq
""
)
{
Write-Host
"Need a value for -blobFeedKey"
exit
1
}
if
(
$configDir
-eq
""
)
{
Write-Host
"Need a value for -configDir"
exit
1
}
Exec-Console
$msbuild
"/p:ConfigDir=
$configDir
/p:ExpectedFeedUrl=
$blobFeedUrl
/p:AccountKey=
$blobFeedKey
/p:OutputPath=
$configDir
PublishBlobAssets.proj"
}
catch
{
Write-Host
$_
Write-Host
$_
.
Exception
Write-Host
$_
.
ScriptStackTrace
exit
1
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录