Skip to content

Commit

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

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

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

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

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

- Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20115.1
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20115.1
- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20115.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20115.1
- Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20115.1
- Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20115.1
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20115.1
- Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20115.1
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20115.1
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20115.1
- Microsoft.DotNet.GenFacades - 5.0.0-beta.20115.1
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20115.1
- Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20115.1
- Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20115.1
  • Loading branch information
dotnet-maestro[bot] committed Feb 16, 2020
1 parent 9cba68e commit 12cf6a8
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 111 deletions.
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,65 +42,65 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20112.7">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="5.0.0-beta.20112.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20112.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
<Sha>e133be6cf759f6badf7bc4052118ad8197eb03bf</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 Down
20 changes: 10 additions & 10 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@
</ItemGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20112.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20112.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20112.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20112.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20112.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20112.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20112.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20112.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20112.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20112.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20115.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20115.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20115.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20115.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20115.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20115.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20115.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20115.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20115.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20115.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.20080.9</MicrosoftNETCoreDotNetHostVersion>
Expand Down
44 changes: 0 additions & 44 deletions eng/common/post-build/darc-gather-drop.ps1

This file was deleted.

2 changes: 1 addition & 1 deletion eng/common/post-build/nuget-validation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ param(
try {
. $PSScriptRoot\post-build-utils.ps1

$url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/jver-verify/src/VerifyMicrosoftPackage/verify.ps1'
$url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1'

New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force

Expand Down
23 changes: 0 additions & 23 deletions eng/common/templates/post-build/darc-gather-drop.yml

This file was deleted.

2 changes: 1 addition & 1 deletion eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ function GetDotNetInstallScript {

# Use curl if available, otherwise use wget
if command -v curl > /dev/null; then
with_retries curl "$install_script_url" -isSLv --retry 10 --create-dirs -o "$install_script" || {
with_retries curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
local exit_code=$?
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
ExitWithExitCode $exit_code
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python": "2.7.15"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20112.7",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20112.7",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20112.7",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20112.7",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20115.1",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20115.1",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20115.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20115.1",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2",
"Microsoft.Build.NoTargets": "1.0.53",
Expand Down

0 comments on commit 12cf6a8

Please sign in to comment.