Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
089fb002
W
wpf
项目概览
dotNET Platform
/
wpf
12 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wpf
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
089fb002
编写于
7月 20, 2022
作者:
D
dotnet-maestro[bot]
提交者:
GitHub
7月 20, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20220719.9 (#6835)
[main] Update dependencies from dotnet/arcade
上级
5c9922f4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
28 addition
and
14 deletion
+28
-14
eng/Version.Details.xml
eng/Version.Details.xml
+10
-10
eng/Versions.props
eng/Versions.props
+2
-2
eng/common/generate-sbom-prep.ps1
eng/common/generate-sbom-prep.ps1
+2
-0
eng/common/generate-sbom-prep.sh
eng/common/generate-sbom-prep.sh
+12
-0
global.json
global.json
+2
-2
未找到文件。
eng/Version.Details.xml
浏览文件 @
089fb002
...
@@ -75,25 +75,25 @@
...
@@ -75,25 +75,25 @@
</Dependency>
</Dependency>
</ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"7.0.0-beta.2236
8.5
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"7.0.0-beta.2236
9.9
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
6bf3e1d9cd29fe839be38a4c051aa307cf96f5d
0
</Sha>
<Sha>
cda764613f89280de6d5c5383ebded9ac01ebd0
0
</Sha>
</Dependency>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"7.0.0-beta.2236
8.5
"
>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"7.0.0-beta.2236
9.9
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
6bf3e1d9cd29fe839be38a4c051aa307cf96f5d
0
</Sha>
<Sha>
cda764613f89280de6d5c5383ebded9ac01ebd0
0
</Sha>
</Dependency>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"7.0.0-beta.2236
8.5
"
>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"7.0.0-beta.2236
9.9
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
6bf3e1d9cd29fe839be38a4c051aa307cf96f5d
0
</Sha>
<Sha>
cda764613f89280de6d5c5383ebded9ac01ebd0
0
</Sha>
</Dependency>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"7.0.0-beta.2236
8.5
"
>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"7.0.0-beta.2236
9.9
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
6bf3e1d9cd29fe839be38a4c051aa307cf96f5d
0
</Sha>
<Sha>
cda764613f89280de6d5c5383ebded9ac01ebd0
0
</Sha>
</Dependency>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"7.0.0-beta.2236
8.5
"
>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"7.0.0-beta.2236
9.9
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
6bf3e1d9cd29fe839be38a4c051aa307cf96f5d
0
</Sha>
<Sha>
cda764613f89280de6d5c5383ebded9ac01ebd0
0
</Sha>
</Dependency>
</Dependency>
</ToolsetDependencies>
</ToolsetDependencies>
</Dependencies>
</Dependencies>
eng/Versions.props
浏览文件 @
089fb002
...
@@ -48,8 +48,8 @@
...
@@ -48,8 +48,8 @@
</PropertyGroup>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>
7.0.0-beta.2236
8.5
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetApiCompatVersion>
7.0.0-beta.2236
9.9
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
7.0.0-beta.2236
8.5
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
7.0.0-beta.2236
9.9
</MicrosoftDotNetCodeAnalysisPackageVersion>
</PropertyGroup>
</PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
...
...
eng/common/generate-sbom-prep.ps1
浏览文件 @
089fb002
...
@@ -2,6 +2,8 @@ Param(
...
@@ -2,6 +2,8 @@ Param(
[
Parameter
(
Mandatory
=
$true
)][
string
]
$ManifestDirPath
# Manifest directory where sbom will be placed
[
Parameter
(
Mandatory
=
$true
)][
string
]
$ManifestDirPath
# Manifest directory where sbom will be placed
)
)
.
$PSScriptRoot
\pipeline-logging-functions.ps1
Write-Host
"Creating dir
$ManifestDirPath
"
Write-Host
"Creating dir
$ManifestDirPath
"
# create directory for sbom manifest to be placed
# create directory for sbom manifest to be placed
if
(
!
(
Test-Path
-path
$ManifestDirPath
))
if
(
!
(
Test-Path
-path
$ManifestDirPath
))
...
...
eng/common/generate-sbom-prep.sh
浏览文件 @
089fb002
...
@@ -2,6 +2,18 @@
...
@@ -2,6 +2,18 @@
source
=
"
${
BASH_SOURCE
[0]
}
"
source
=
"
${
BASH_SOURCE
[0]
}
"
# resolve $SOURCE until the file is no longer a symlink
while
[[
-h
$source
]]
;
do
scriptroot
=
"
$(
cd
-P
"
$(
dirname
"
$source
"
)
"
&&
pwd
)
"
source
=
"
$(
readlink
"
$source
"
)
"
# if $source was a relative symlink, we need to resolve it relative to the path where the
# symlink file was located
[[
$source
!=
/
*
]]
&&
source
=
"
$scriptroot
/
$source
"
done
scriptroot
=
"
$(
cd
-P
"
$(
dirname
"
$source
"
)
"
&&
pwd
)
"
.
$scriptroot
/pipeline-logging-functions.sh
manifest_dir
=
$1
manifest_dir
=
$1
if
[
!
-d
"
$manifest_dir
"
]
;
then
if
[
!
-d
"
$manifest_dir
"
]
;
then
...
...
global.json
浏览文件 @
089fb002
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
}
}
},
},
"msbuild-sdks"
:
{
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"7.0.0-beta.2236
8.5
"
,
"Microsoft.DotNet.Arcade.Sdk"
:
"7.0.0-beta.2236
9.9
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"7.0.0-beta.2236
8.5
"
"Microsoft.DotNet.Helix.Sdk"
:
"7.0.0-beta.2236
9.9
"
},
},
"sdk"
:
{
"sdk"
:
{
"version"
:
"7.0.100-preview.5.22307.18"
"version"
:
"7.0.100-preview.5.22307.18"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录