Skip to content

Commit

Permalink
[master] Update dependencies from 4 repositories (#32858)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20200225.9

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

* Update dependencies from https://github.com/microsoft/vstest build 20200226-03

- Microsoft.NET.Test.Sdk - 16.6.0-preview-20200226-03

* Update dependencies from https://github.com/dotnet/runtime-assets build 20200225.1

- System.Windows.Extensions.TestData - 5.0.0-beta.20125.1
- System.Security.Cryptography.X509Certificates.TestData - 5.0.0-beta.20125.1
- System.Private.Runtime.UnicodeData - 5.0.0-beta.20125.1
- System.Net.TestData - 5.0.0-beta.20125.1
- System.IO.Packaging.TestData - 5.0.0-beta.20125.1
- System.IO.Compression.TestData - 5.0.0-beta.20125.1
- System.Drawing.Common.TestData - 5.0.0-beta.20125.1
- System.ComponentModel.TypeConverter.TestData - 5.0.0-beta.20125.1

* fix the libraries build

* Update Directory.Build.props

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

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

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

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

* Update dependencies from https://github.com/mono/linker build 20200227.1

- ILLink.Tasks - 0.1.6-prerelease.20127.1

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

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

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

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

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

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

Co-authored-by: Anirudh Agnihotry <[email protected]>
  • Loading branch information
dotnet-maestro[bot] and Anipik authored Mar 2, 2020
1 parent 58ee130 commit 0bf721a
Show file tree
Hide file tree
Showing 9 changed files with 136 additions and 83 deletions.
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,61 +6,61 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20124.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20124.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20151.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>03bd0e0cefb81d33d08c4853fa5d6a8057c34d94</Sha>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</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>
Expand All @@ -82,41 +82,41 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d0bb63d2ec7060714e63ee4082fac48f2e57f3e2</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.6.0-preview-20200225-01">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.6.0-preview-20200226-03">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>5cd81e44cd7ac84124cab30dbc9b136b4a3312f6</Sha>
<Sha>57527561e6342aaaaca4012dc14d25ad08c0a326</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20118.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20125.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>d08f5c335e32348b986440b61c75bce196b96da8</Sha>
<Sha>d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20118.1">
<Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20125.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>d08f5c335e32348b986440b61c75bce196b96da8</Sha>
<Sha>d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20118.1">
<Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20125.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>d08f5c335e32348b986440b61c75bce196b96da8</Sha>
<Sha>d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20118.1">
<Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20125.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>d08f5c335e32348b986440b61c75bce196b96da8</Sha>
<Sha>d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="5.0.0-beta.20118.1">
<Dependency Name="System.Net.TestData" Version="5.0.0-beta.20125.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>d08f5c335e32348b986440b61c75bce196b96da8</Sha>
<Sha>d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20118.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20125.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>d08f5c335e32348b986440b61c75bce196b96da8</Sha>
<Sha>d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20118.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20125.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>d08f5c335e32348b986440b61c75bce196b96da8</Sha>
<Sha>d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20118.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20125.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>d08f5c335e32348b986440b61c75bce196b96da8</Sha>
<Sha>d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="6.0.1-alpha.1.20124.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -166,9 +166,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e793fcc19797f407a1b7e98d5f81b04e25a551c3</Sha>
</Dependency>
<Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.20122.1">
<Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.20127.1">
<Uri>https://github.com/mono/linker</Uri>
<Sha>e06788800df2d0431c0821e1116406ff3a67226a</Sha>
<Sha>cd01694ab1406159dd8e3f0ab81624f5feec2414</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
40 changes: 20 additions & 20 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@
</ItemGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20124.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20124.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20124.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20124.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20124.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20124.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20124.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20124.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20124.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20124.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20151.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20151.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20151.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20151.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20151.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20151.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20151.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20151.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20151.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20151.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreDotNetHostVersion>
Expand All @@ -79,14 +79,14 @@
<!-- Libraries dependencies -->
<runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20118.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>5.0.0-beta.20118.1</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>5.0.0-beta.20118.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>5.0.0-beta.20118.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>5.0.0-beta.20118.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.20118.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.20118.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20118.1</SystemWindowsExtensionsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20125.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>5.0.0-beta.20125.1</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>5.0.0-beta.20125.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>5.0.0-beta.20125.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>5.0.0-beta.20125.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.20125.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.20125.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20125.1</SystemWindowsExtensionsTestDataVersion>
<!-- Standard dependencies -->
<NETStandardLibraryVersion>2.2.0-prerelease.19564.1</NETStandardLibraryVersion>
<!-- dotnet-optimization dependencies -->
Expand All @@ -111,7 +111,7 @@
<!-- System.Data.SqlClient -->
<SystemDataSqlClientVersion>4.8.0</SystemDataSqlClientVersion>
<!-- Testing -->
<MicrosoftNETTestSdkVersion>16.6.0-preview-20200225-01</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>16.6.0-preview-20200226-03</MicrosoftNETTestSdkVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<TraceEventVersion>2.0.5</TraceEventVersion>
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
Expand All @@ -120,7 +120,7 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>3.1.0-preview-20200129.1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.20122.1</ILLinkTasksVersion>
<ILLinkTasksVersion>0.1.6-prerelease.20127.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20124.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20124.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/dotnet-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ case $cpuname in
amd64|x86_64)
buildarch=x64
;;
armv7l)
armv*l)
buildarch=arm
;;
i686)
Expand Down
49 changes: 40 additions & 9 deletions eng/common/init-tools-native.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ while (($# > 0)); do
force=true
shift 1
;;
--donotabortonfailure)
donotabortonfailure=true
shift 1
;;
--donotdisplaywarnings)
donotdisplaywarnings=true
shift 1
;;
--downloadretries)
download_retries=$2
shift 2
Expand All @@ -52,6 +60,8 @@ while (($# > 0)); do
echo " - (default) %USERPROFILE%/.netcoreeng/native"
echo ""
echo " --clean Switch specifying not to install anything, but cleanup native asset folders"
echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure"
echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure"
echo " --force Clean and then install tools"
echo " --help Print help and exit"
echo ""
Expand Down Expand Up @@ -92,6 +102,7 @@ if [[ -z $install_directory ]]; then
fi

install_bin="${native_base_dir}/bin"
installed_any=false

ReadGlobalJsonNativeTools

Expand All @@ -103,8 +114,8 @@ else
for tool in "${!native_assets[@]}"
do
tool_version=${native_assets[$tool]}
installer_name="install-$tool.sh"
installer_command="$native_installer_dir/$installer_name"
installer_path="$native_installer_dir/install-$tool.sh"
installer_command="$installer_path"
installer_command+=" --baseuri $base_uri"
installer_command+=" --installpath $install_bin"
installer_command+=" --version $tool_version"
Expand All @@ -118,11 +129,29 @@ else
installer_command+=" --clean"
fi

$installer_command

if [[ $? != 0 ]]; then
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed"
exit 1
if [[ -a $installer_path ]]; then
$installer_command
if [[ $? != 0 ]]; then
if [[ $donotabortonfailure = true ]]; then
if [[ $donotdisplaywarnings != true ]]; then
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed"
fi
else
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed"
exit 1
fi
else
$installed_any = true
fi
else
if [[ $donotabortonfailure == true ]]; then
if [[ $donotdisplaywarnings != true ]]; then
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script"
fi
else
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script"
exit 1
fi
fi
done
fi
Expand All @@ -135,8 +164,10 @@ if [[ -d $install_bin ]]; then
echo "Native tools are available from $install_bin"
echo "##vso[task.prependpath]$install_bin"
else
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed"
exit 1
if [[ $installed_any = true ]]; then
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed"
exit 1
fi
fi

exit 0
Loading

0 comments on commit 0bf721a

Please sign in to comment.