提交 6cfbbef6 编写于 作者: D dotnet-maestro[bot] 提交者: Viktor Hofer

[master] Update dependencies from dotnet/arcade mono/linker Microsoft/vstest (#1804)

* Update dependencies from https://github.com/dotnet/arcade build 20200115.5

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20065.5
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20065.5
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20065.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20065.5
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20065.5
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20065.5
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20065.5
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20065.5
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20065.5
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20065.5
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20065.5
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20065.5
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20065.5
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20065.5

* Update dependencies from https://github.com/dotnet/arcade build 20200116.1

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20066.1
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20066.1
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20066.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20066.1
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20066.1
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20066.1
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20066.1
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20066.1
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20066.1
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20066.1
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20066.1
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20066.1
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20066.1
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20066.1

* Update dependencies from https://github.com/microsoft/vstest build 20200116-01

- Microsoft.NET.Test.Sdk - 16.5.0-preview-20200116-01

* Update dependencies from https://github.com/dotnet/arcade build 20200117.2

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20067.2
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20067.2
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20067.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20067.2
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20067.2
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20067.2
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20067.2
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20067.2
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20067.2
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20067.2
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20067.2
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20067.2
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20067.2
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20067.2

* Update dependencies from https://github.com/dotnet/arcade build 20200118.1

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20068.1
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20068.1
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20068.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20068.1
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20068.1
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20068.1
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20068.1
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20068.1
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20068.1
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20068.1
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20068.1
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20068.1
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20068.1
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20068.1

* Update dependencies from https://github.com/microsoft/vstest build 20200120-01

- Microsoft.NET.Test.Sdk - 16.5.0-preview-20200120-01

* Update dependencies from https://github.com/dotnet/arcade build 20200121.3

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20071.3
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20071.3
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20071.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20071.3
- Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20071.3
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20071.3
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20071.3
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20071.3
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20071.3
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20071.3
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20071.3
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20071.3
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20071.3
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20071.3
上级 28646107
......@@ -46,61 +46,61 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20063.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20063.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20071.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>be2d4ae34b4fcfe35beb9bdaeb7b7990c1147740</Sha>
<Sha>e06e2807048b6bc7b3549b401a1833bed3bcd8c3</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
......@@ -114,9 +114,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d0bb63d2ec7060714e63ee4082fac48f2e57f3e2</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.5.0-preview-20200113-03">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.5.0-preview-20200120-01">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>8d0cd143dade719166811ecc21d4ed3d0b2d0ba6</Sha>
<Sha>51a2b03cadbcf0753d7be5b0e42f69828250280f</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.19610.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
......
......@@ -32,16 +32,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20063.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20063.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20063.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20063.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20063.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20063.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20063.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20063.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20063.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20063.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20071.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20071.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20071.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20071.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20071.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20071.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20071.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20071.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20071.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20071.3</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19562.8</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19563.6</MicrosoftNETCoreDotNetHostVersion>
......@@ -86,7 +86,7 @@
<!-- sni -->
<RuntimeWinX64RuntimeNativeSystemDataSqlClientSniVersion>4.4.0</RuntimeWinX64RuntimeNativeSystemDataSqlClientSniVersion>
<!-- Testing -->
<MicrosoftNETTestSdkVersion>16.5.0-preview-20200113-03</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>16.5.0-preview-20200120-01</MicrosoftNETTestSdkVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<TraceEventVersion>2.0.5</TraceEventVersion>
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
......
......@@ -25,8 +25,9 @@ __UbuntuPackages="build-essential"
__AlpinePackages="alpine-base"
__AlpinePackages+=" build-base"
__AlpinePackages+=" linux-headers"
__AlpinePackages+=" lldb-dev"
__AlpinePackages+=" llvm-dev"
__AlpinePackagesEdgeTesting=" lldb-dev"
__AlpinePackagesEdgeMain=" llvm9-libs"
__AlpinePackagesEdgeMain+=" python3"
# symlinks fixer
__UbuntuPackages+=" symlinks"
......@@ -199,13 +200,23 @@ if [[ "$__LinuxCodeName" == "alpine" ]]; then
tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir
mkdir -p $__RootfsDir/usr/bin
cp -v /usr/bin/qemu-$__QEMUArch-static $__RootfsDir/usr/bin
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
add $__AlpinePackages
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
add $__AlpinePackagesEdgeMain
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
add $__AlpinePackagesEdgeTesting
rm -r $__ApkToolsDir
elif [[ -n $__LinuxCodeName ]]; then
qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo
......
......@@ -12,10 +12,10 @@
"python": "2.7.15"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20063.2",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20063.2",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20063.2",
"Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20063.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20071.3",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20071.3",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20071.3",
"Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.20071.3",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19563.3",
"Microsoft.Build.NoTargets": "1.0.53",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册